MegaZeux 2.60 release.

CHANGELOG

@@ -1,9 +1,17 @@
+2.51ak release:
++ Added Numerous new Counters
++ Added new inter robot targeting system
++ Added new SMZX mode, dynamic resolution setting
++ Added SMZX mode character editor, allowing better editing
++ Fixed fatal crash when taking a picture, also increased
+  the number of picture you can take to 99
++ Removed Built-in ASCII charset
++ Added Random color start up
++ Fixed import World Feature
+
 2.51s3.2 release:
 + Removed password protection (no use for it because of Getpw)
 + New counter: BIMesg. Set to 0 to turn off messages like "Ouch!"
-+ Source code *PATCH* can be found at: www.geocities.com/obinator256/galaxy.html
-  (you must unzip the patch in the source directory, overwriting the original files)
-
 
 2.51s3.1 release:
 + Fixed damage table, now works correctly

Makefile

@@ -25,9 +25,9 @@ TLINK = tlink
 .asm.obj:
 	@$(TASM) /jWARN /MX /M5 /ZI /O /T $<,$@
 
-obj  = arrowkey.obj beep.obj blink.obj block.obj boardmem.obj ceh.obj \
-charset.obj char_ed.obj comp_chk.obj counter.obj cursor.obj data.obj \
-data2.obj detect.obj dt_data.obj edit.obj edit_di.obj egacode.obj \
+obj  = admath.obj arrowkey.obj beep.obj blink.obj block.obj boardmem.obj \
+ceh.obj charset.obj char_ed.obj comp_chk.obj counter.obj cursor.obj \
+data.obj data2.obj detect.obj dt_data.obj edit.obj edit_di.obj egacode.obj \
 ems.obj error.obj ezboard.obj fill.obj game.obj game2.obj getkey.obj \
 graphics.obj helpsys.obj hexchar.obj idarray.obj idput.obj intake.obj \
 main.obj meminter.obj meter.obj mouse.obj new_mod.obj palette.obj \
@@ -41,9 +41,9 @@ sfx_edit.obj string.obj timer.obj window.obj
 # list. So it's just copy/pasted. This tr command helps:
 #   tr ' ' '+' << "EOF"
 #
-lobj = arrowkey.obj+beep.obj+blink.obj+block.obj+boardmem.obj+ceh.obj+\
-charset.obj+char_ed.obj+comp_chk.obj+counter.obj+cursor.obj +data.obj+\
-data2.obj+detect.obj+dt_data.obj+edit.obj+edit_di.obj+egacode.obj+\
+lobj = admath.obj+arrowkey.obj+beep.obj+blink.obj+block.obj+boardmem.obj+\
+ceh.obj+charset.obj+char_ed.obj+comp_chk.obj+counter.obj+cursor.obj+\
+data.obj+data2.obj+detect.obj+dt_data.obj+edit.obj+edit_di.obj+egacode.obj+\
 ems.obj+error.obj+ezboard.obj+fill.obj+game.obj+game2.obj+getkey.obj+\
 graphics.obj+helpsys.obj+hexchar.obj+idarray.obj+idput.obj+intake.obj+\
 main.obj+meminter.obj+meter.obj+mouse.obj+new_mod.obj+palette.obj+\

admath.cpp

@@ -0,0 +1,20 @@
+#include "admath.h"
+
+int sqrt(int a)
+{
+	int loc =128;
+	int x = loc * loc;
+	int level = 6;
+	while((level >= 0) && (x != a))
+	{
+		if(a > x) loc += (1<<level);
+		else loc -= (1<<level);
+		level --;
+		x = loc * loc;
+	}
+	int test = (loc * loc)-a;
+	if (test >= loc) loc --;
+	else if (test < (loc * -1)) loc ++;
+	return loc;
+
+}

admath.h

@@ -0,0 +1,7 @@
+#ifndef __ADMATH_H
+#define __ADMATH_H
+
+
+int sqrt(int);
+
+#endif

block.cpp

@@ -111,9 +111,9 @@ int rtoo_obj_type(void) {
 char csdi_types[3]={ DE_RADIO,DE_BUTTON,DE_BUTTON };
 char csdi_xs[3]={ 6,5,15 };
 char csdi_ys[3]={ 4,11,11 };
-char far *csdi_strs[3]={ "MegaZeux default\nASCII set\nBlank set",
+char far *csdi_strs[3]={ "MegaZeux default\nBlank set",
 "OK","Cancel" };
-int csdi_p1s[3]={ 3,0,-1 };
+int csdi_p1s[3]={ 2,0,-1 };
 int csdi_p2s[1]={ 16 };
 int cs_type=0;
 void far *csdi_storage[1]={ &cs_type };

char_ed.cpp

@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+//I went ahead and commented out the entire smzx char edit stuff -Koji
 //Character editor
 
 #include "helpsys.h"
@@ -32,6 +32,7 @@
 #include "hexchar.h"
 #include "data.h"
 #include "charset.h"
+#include "palette.h"
 
 //-------------------------------------------------
 //     +----------------+ Current char-     (#000)
@@ -48,7 +49,7 @@
 // 000 |................| F2      Copy to buffer
 // 000 |................| F3      Copy from buffer
 // 000 |................| Tab     Draw (off)
-// 000 |................| F4      Revert to Ascii
+// 000 |................|
 //     +----------------+ F5      Revert to MZX
 //-------------------------------------------------
 
@@ -57,7 +58,7 @@
 //       "Current Char-"=Enter
 //       "..0.."=Change char
 
-int ce_menu_cmds[14]={ 0,0,' ',13,-83,'N',0,'M','F',-60,-61,9,-62,-63 };
+int ce_menu_cmds[13]={ 0,0,' ',13,-83,'N',0,'M','F',-60,-61,9,-63 };
 
 int char_editor(void) {
 	unsigned char matrix[14];
@@ -84,22 +85,52 @@ F  'Flip'\n\
 F2 Copy to buffer\n\
 F3 Copy from buffer\n\
 TabDraw\n\
-F4 Revert to Ascii\n\
+\n\
 F5 Revert to MZX",40,4,143,current_pg_seg);
 	m_show();
 	//Get char
 	ec_read_char(chr,matrix);
-	do {
+	do
+	{
 		//Update char
 		m_hide();
-		for(t1=0;t1<8;t1++) {
-			for(t2=0;t2<14;t2++) {
+		/*if (smzx_mode)
+		{
+			for(t2=0;t2<14;t2++)
+			{
+				for(t1=0;t1<8;t1++)
+				{
+					bit = (matrix[t2]&(128>>t1))/(128>>t1) + 2 * (matrix[t2]&(64>>t1))/(64>>t1);
+					switch(bit)
+					{
+						case 3:
+							write_string("ÛÛÛÛ",22+(t1<<1),5+t2,135,current_pg_seg);
+							break;
+						case 2:
+							write_string("²²²²",22+(t1<<1),5+t2,135,current_pg_seg);
+							break;
+						case 1:
+							write_string("°°°°",22+(t1<<1),5+t2,135,current_pg_seg);
+							break;
+						default:
+							write_string("úúúú",22+(t1<<1),5+t2,135,current_pg_seg);
+						break;
+					}
+				t1++;
+				}
+			}
+		}*/
+		for(t1=0;t1<8;t1++)
+		{
+			for(t2=0;t2<14;t2++)
+			{
 				bit=matrix[t2]&(128>>t1);
 				if(bit) write_string("ÛÛ",22+(t1<<1),5+t2,135,
 					current_pg_seg);
 				else write_string("úú",22+(t1<<1),5+t2,135,current_pg_seg);
-				}
 			}
+		}
+
 		for(t2=0;t2<14;t2++)
 			write_number(matrix[t2],135,17,5+t2,current_pg_seg,3);
 		//Update draw status
@@ -252,12 +283,6 @@ F5 Revert to MZX",40,4,143,current_pg_seg);
 					matrix[t1]^=255;
 				ec_change_char(chr,matrix);
 				break;
-			case -62:
-				//Revert to ascii
-				for(t1=0;t1<14;t1++)
-					matrix[t1]=ascii_set[chr*14+t1];
-				ec_change_char(chr,matrix);
-				break;
 			case -63:
 				//Revert to megazeux
 				for(t1=0;t1<14;t1++)