ref: 4a104a527c4c76fb9029da54cfd13bd247eb17b5
parent: c59f9ef4183c71c6375b24e783910b7e7fdd88d5
author: cuckydev <cuckydev@users.noreply.github.com>
date: Tue Jan 29 12:47:34 EST 2019
FORTNTIE
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,12 @@
endif
ifeq ($(WINDOWS), 1)
- ifeq ($(CONSOLE), 1)
+ CXXFLAGS += -DWINDOWS
+ LIBS += -lkernel32
+endif
+
+ifeq ($(CONSOLE), 1)
CXXFLAGS += -mconsole
- endif
-CXXFLAGS += -DWINDOWS
-LIBS += -lkernel32
endif
CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags`
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -206,7 +206,7 @@
//Animate the wind
static int count = 0;
- count++;
+ count += 2;
for (int j = put_y; put_y + num_y > j; j++)
{
--- a/src/MiniMap.cpp
+++ b/src/MiniMap.cpp
@@ -160,10 +160,7 @@
}
PutBitmap4(&grcGame, 0, 0, &grcGame, 10);
- rcView.left = 160 - f * gMap.width / 16;
- rcView.right = f * gMap.width / 16 + 160;
- rcView.top = 120 - f * gMap.length / 16;
- rcView.bottom = f * gMap.length / 16 + 120;
+ rcView = {(WINDOW_WIDTH / 2) - f * gMap.width / 16, (WINDOW_HEIGHT / 2) - f * gMap.length / 16, (WINDOW_WIDTH / 2) + f * gMap.width / 16, (WINDOW_HEIGHT / 2) + f * gMap.length / 16};
PutMapName(true);
CortBox(&rcView, 0);
--- a/src/TextScr.cpp
+++ b/src/TextScr.cpp
@@ -11,6 +11,7 @@
#include "MyChar.h"
#include "Fade.h"
#include "Stage.h"
+#include "Frame.h"
#include "MycParam.h"
#include "Flags.h"
#include "Profile.h"
@@ -839,6 +840,33 @@
else
gTS.p_read += 13;
}
+ else if (IS_COMMAND('S','S','S'))
+ {
+ x = GetTextScriptNo(gTS.p_read + 4);
+ SetNoise(1, x);
+ gTS.p_read += 8;
+ }
+ else if (IS_COMMAND('C','S','S'))
+ {
+ CutNoise();
+ gTS.p_read += 4;
+ }
+ else if (IS_COMMAND('S','P','S'))
+ {
+ SetNoise(2, x);
+ gTS.p_read += 8;
+ }
+ else if (IS_COMMAND('C','P','S'))
+ {
+ CutNoise();
+ gTS.p_read += 4;
+ }
+ else if (IS_COMMAND('Q','U','A'))
+ {
+ z = GetTextScriptNo(gTS.p_read + 4);
+ SetQuake(z);
+ gTS.p_read += 8;
+ }
else if (IS_COMMAND('F','A','I'))
{
z = GetTextScriptNo(gTS.p_read + 4);
@@ -859,6 +887,19 @@
{
StartMapName();
gTS.p_read += 4;
+ }
+ else if (IS_COMMAND('F','O','M'))
+ {
+ z = GetTextScriptNo(gTS.p_read + 4);
+ SetFrameTargetMyChar(z);
+ gTS.p_read += 8;
+ }
+ else if (IS_COMMAND('F','O','N'))
+ {
+ x = GetTextScriptNo(gTS.p_read + 4);
+ y = GetTextScriptNo(gTS.p_read + 9);
+ SetFrameTargetNpChar(x, y);
+ gTS.p_read += 13;
}
else if (IS_COMMAND('S','O','U'))
{
--
⑨