new file: 16/v2/source/ENGINE/MAKE.BAT

	modified:   16/v2/source/ENGINE/MAKEFILE
	modified:   16/v2/source/MAPED/GUI.C
	modified:   16/v2/source/MAPED/RENDER.H
	modified:   README

diff --git a/16/v2/source/ENGINE/MAKE.BAT b/16/v2/source/ENGINE/MAKE.BAT
new file mode 100644 (file)
index 0000000..291b92e
--- /dev/null
+++ b/16/v2/source/ENGINE/MAKE.BAT
@@ -0,0 +1,23 @@
+wcc386 a_memory.c\r
+wcc386 conlib.c\r
+wcc386 console.c\r
+wcc386 controls.c\r
+wcc386 engine.c\r
+wcc386 entity.c\r
+wcc386 fli.c\r
+wcc386 font.c\r
+wcc386 image.c\r
+wcc386 message.c\r
+wcc386 mikmod.c\r
+wcc386 mode13h.c\r
+wcc386 modeinit.c\r
+wcc386 modex.c\r
+wcc386 render.c\r
+wcc386 sound.c\r
+wcc386 startup.c\r
+wcc386 timer.c\r
+wcc386 vc.c\r
+wcc386 vdriver.c\r
+wcc386 verge.c\r
+wcc386 vesa.c\r
+wcc386 vfile.c\r

diff --git a/16/v2/source/ENGINE/MAKEFILE b/16/v2/source/ENGINE/MAKEFILE
index f557fa319603f4aec43b3a9d0566eff62b7baae8..db5016dafe0ebdc62106fa4625f6d004511bc215 100644 (file)
--- a/16/v2/source/ENGINE/MAKEFILE
+++ b/16/v2/source/ENGINE/MAKEFILE
@@ -1,7 +1,7 @@
-CC = gcc\r
+CC = wcc386\r
 CFLAGS = -s -Wall -Werror\r
 \r
-OBJ = a_memory.o conlib.o console.o  controls.o engine.o entity.o font.o image.o  keyboard.o message.o  modeinit.o render.o  startup.o  timer.o verge.o vc.o  vdriver.o vfile.o fli.o sound.o mikmod.a\r
+OBJ = a_memory.obj conlib.obj console.obj  controls.obj engine.obj entity.obj font.obj image.obj  keyboard.obj message.obj  modeinit.obj render.obj  startup.obj  timer.obj verge.obj vc.obj  vdriver.obj vfile.obj fli.obj sound.obj mikmod.a\r
 \r
 verge: $(OBJ)\r
 \r

diff --git a/16/v2/source/MAPED/GUI.C b/16/v2/source/MAPED/GUI.C
index 49bdc469ea62481a85c4e2bd5cc4cdf8af899e67..d4869d421ab597331bd2222550a05fff7624acb0 100644 (file)
--- a/16/v2/source/MAPED/GUI.C
+++ b/16/v2/source/MAPED/GUI.C
@@ -260,7 +260,7 @@ void MainMenu(int dx, int dy)
        if (my>dy+47 && my<dy+54) { done=1; WaitRelease(); MPDialog(); break; }\r
        if (my>dy+53 && my<dy+60) { done=1; WaitRelease(); CDDialog(); break; }\r
        if (my>dy+59 && my<dy+66) { done=1; WaitRelease(); Columns(); break; }\r
-       if (my>dy+65 && my<dy+72) { done=1; WaitRelease(); ExecuteSubMenu(); break; }\r
+       if (my>dy+65 && my<dy+72) { done=1; WaitRelease(); ExecuteSubMenu(0, 0); break; }\r
        if (my>dy+71 && my<dy+78) { done=1; WaitRelease(); key[SCAN_X]=1; key[SCAN_ALT]=1; break; }\r
        if (my>dy+80 && my<dy+87) { done=1; About(); break; }\r
     }\r

diff --git a/16/v2/source/MAPED/RENDER.H b/16/v2/source/MAPED/RENDER.H
index 4e9c7bc53b91fa8c9013b13bab70d0290baffccb..5849d32b90d0439185b2f3198b4af879f0f86d76 100644 (file)
--- a/16/v2/source/MAPED/RENDER.H
+++ b/16/v2/source/MAPED/RENDER.H
@@ -42,7 +42,8 @@ extern void DoCHR(int i);
 extern void DoCHRdealy();\r
 extern void BlitBackLayer(char l);\r
 extern void LucentBlitLayer(char l);\r
-extern void TransBlitLayer(char l);\r
+extern void TransBlitLayer(char l);
+extern void TransBlitLayer_(char l);\r
 extern void BlitLayer(char c);\r
 extern void DrawObstructions();\r
 extern void DrawZones();\r

diff --git a/README b/README
index 9ba2ecad9a9d05938e9695e5603904fe98903334..f92360cc4c4728c318a4dd5c25f796b4137d56fe 100644 (file)
--- a/README
+++ b/README
@@ -20,6 +20,8 @@ DONE 5. sprite rendering
 14. masking layer!
 15. 8088 detection to turn off vsync!
 16. (very important!) optimize modexDrawBmpRegion so it can draw the bloody tiles and continue moving or make sure that you can move and draw the tiles at the same time\r
+
+17. merge scripting system and map system from verge 2
 \r
 To compile:\r
 You need Open Watcom stable to compile and just run wmake\r