new file: 16/PCX_LIB/chikyuu.pcx

	modified:   16/modex16/chikyuu.pcx
	renamed:    16/chikyuu.pcx -> 16/w_modex/CHIKYUU.PCX
	modified:   16/w_modex/M.BAT
	modified:   16/w_modex/TEST.CPP
	modified:   16/w_modex/TEST.EXE
	new file:   README

diff --git a/16/PCX_LIB/chikyuu.pcx b/16/PCX_LIB/chikyuu.pcx
new file mode 100644 (file)
index 0000000..23bb19b
Binary files /dev/null and b/16/PCX_LIB/chikyuu.pcx differ

diff --git a/16/modex16/chikyuu.pcx b/16/modex16/chikyuu.pcx
index 61eac4cca4a06694e7425fe70b7ec3e0e8c88cbc..610a6c32fe96500d5eb0d0d955b66a71d4ed196b 100644 (file)
Binary files a/16/modex16/chikyuu.pcx and b/16/modex16/chikyuu.pcx differ

diff --git a/16/chikyuu.pcx b/16/w_modex/CHIKYUU.PCX
similarity index 98%
rename from 16/chikyuu.pcx
rename to 16/w_modex/CHIKYUU.PCX
index 61eac4cca4a06694e7425fe70b7ec3e0e8c88cbc..610a6c32fe96500d5eb0d0d955b66a71d4ed196b 100644 (file)
Binary files a/16/chikyuu.pcx and b/16/w_modex/CHIKYUU.PCX differ

diff --git a/16/w_modex/M.BAT b/16/w_modex/M.BAT
index 5bcb63a558d16cc2aef68507abbdda81bc527a50..a5d88f5d1a4985e50d95b3ef69107bb49d765169 100644 (file)
--- a/16/w_modex/M.BAT
+++ b/16/w_modex/M.BAT
@@ -1,2 +1,3 @@
-wcl386 test modex xprim xpal xblitbuf fixed32\r
+wcl /0 test modex xprim xpal xblitbuf\r
+rem fixed32\r
 erase *.obj\r

diff --git a/16/w_modex/TEST.CPP b/16/w_modex/TEST.CPP
index d62d5b356df0595455da1f806d278703583a3652..2e357b4d0ce49e3af2653988fec31202f7642e36 100644 (file)
--- a/16/w_modex/TEST.CPP
+++ b/16/w_modex/TEST.CPP
@@ -5,16 +5,16 @@
 #include <stdlib.h>\r
 #include <time.h>\r
 \r
-#include "fixed32.hpp"\r
+//#include "fixed32.hpp"\r
 #include "modex.hpp"\r
 #include "xprim.hpp"\r
 #include "xpal.hpp"\r
 #include "xblitbuf.hpp"\r
 \r
-#define FIRE_DEMO 1\r
-#define ROTATE_DEMO 1\r
-#define MONSTER_DEMO_ONE 1\r
-#define MONSTER_DEMO_TWO 1\r
+#define FIRE_DEMO 0\r
+#define ROTATE_DEMO 0\r
+#define MONSTER_DEMO_ONE 0\r
+#define MONSTER_DEMO_TWO 0\r
 #define MATH_DEMO 0\r
 \r
 int\r
@@ -26,7 +26,7 @@ monster_demo1(void)
 \r
     clearX(0);\r
 \r
-    load_blitbufPCX("monster.pcx", &sprite_image);\r
+    load_blitbufPCX("chikyuu.pcx", &sprite_image);\r
     aligned_bitblitX(0, 20, &sprite_image);\r
     getch();\r
 \r
@@ -82,7 +82,7 @@ monster_demo2(void)
 \r
     clearX(0);\r
 \r
-    load_blitbufPCX("monster.pcx", &sprite_image);\r
+    load_blitbufPCX("chikyuu.pcx", &sprite_image);\r
     aligned_bitblitX(0, 20, &sprite_image);\r
     getch();\r
 \r
@@ -326,7 +326,7 @@ main(void)
     unsigned char pal[768];\r
     COORD x1, y1, x2, y2;\r
     Iangle theta1, theta2;\r
-    Fixed32 trigSin, trigCos;\r
+    //----Fixed32 trigSin, trigCos;\r
     blitbuf blit_image, sprite_image;\r
     clock_t begin, end;\r
     short int x, y, temp, done;\r
@@ -370,7 +370,7 @@ main(void)
     getch();\r
 #endif\r
 \r
-    load_blitbufPCX("spock.pcx", &blit_image);\r
+    load_blitbufPCX("chikyuu.pcx", &blit_image);\r
     scale_blitbuf(160, 100, &blit_image);\r
     aligned_bitblitX(0, 0, &blit_image);\r
 \r
@@ -401,7 +401,7 @@ main(void)
     getch();\r
 \r
     clear_blitbuf(&blit_image);\r
-    load_blitbufPCX("spock.pcx", &blit_image);\r
+    load_blitbufPCX("chikyuu.pcx", &blit_image);\r
     greyscale_blitbuf(&blit_image);\r
     smooth64_paletteX(1, 0, 1);\r
     aligned_bitblitX(0, 0, &blit_image);\r
@@ -414,7 +414,7 @@ main(void)
     getch();\r
 \r
     clear_blitbuf(&blit_image);\r
-    load_blitbufPCX("spock.pcx", &blit_image);\r
+    load_blitbufPCX("chikyuu.pcx", &blit_image);\r
     aligned_bitblitX(0, 0, &blit_image);\r
 \r
     done = 0;\r
@@ -449,7 +449,7 @@ main(void)
 \r
             case 'L':\r
             case 'l':\r
-                load_blitbufPCX("spock.pcx", &blit_image);\r
+                load_blitbufPCX("chikyuu.pcx", &blit_image);\r
                 break;\r
 \r
             case 'R':\r
@@ -521,7 +521,7 @@ main(void)
 \r
     getch();\r
 \r
-    load_blitbufPCX("buddha.pcx", &sprite_image);\r
+    load_blitbufPCX("chikyuu.pcx", &sprite_image);\r
     transparent_bitblitX(100, 100, &sprite_image);\r
 \r
     getch();\r
@@ -535,7 +535,7 @@ main(void)
     aligned_bitblitX(84, 36, &sprite_image);\r
     getch();\r
 \r
-    initFixed32();\r
+    //----initFixed32();\r
 \r
     theta1=0;\r
     count=0;\r
@@ -593,7 +593,7 @@ main(void)
 \r
     set80x25();\r
 \r
-#if MATH_DEMO\r
+/*#if MATH_DEMO\r
     Fixed32 c1, c2, c3, a1, a2, a3;\r
 \r
     c1 = INT_TO_FIXED(50);\r
@@ -615,7 +615,7 @@ main(void)
     printf("DIV ASM version = %d\n", FIXED_TO_INT(a2));\r
 \r
     getch();\r
-#endif\r
+#endif*/\r
 \r
     temp = (time1 - time2);\r
     printf("10000 lines took %4d ticks\n", time1);\r

diff --git a/16/w_modex/TEST.EXE b/16/w_modex/TEST.EXE
index c130bf508a2d5eee3f6897fbb4b0fc3798a59aeb..ce4555c1cf8fa76da7726ec8a71f4aac83a80335 100644 (file)
Binary files a/16/w_modex/TEST.EXE and b/16/w_modex/TEST.EXE differ

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..ac3e0cf
--- /dev/null
+++ b/README
@@ -0,0 +1,10 @@
+Open watcom to compile the code of project 16\r
+/ = main engine code (branched off due to lack of understanding of C++)\r
+16/ = the current code sparky4 is working with\r
+16/modex16/ = pngwen's code\r
+\r
+TODO:\r
+1. SCROLLING!!!!!!!\r
+2. Fix pngwen's pcx rendering code it dose not render large relolution pcx files well at all!\r
+3. document an understrand how the main engine code works!\r
+4. make the $#@%# game!\r