Removed -fwritable-strings

src/IDEAS

@@ -3,6 +3,12 @@
 * Game able to cope at any virtual resolution in software mode. OpenGL
   handles this transparently
 * Audio support using OpenAL
+  - Problem is, that SDL and OpenAL would need pthread, which with SVGAlib is
+    a no-go... oh well.
 * Add support for the Mac version, if possible
 * Network support!
 * Fully compile with no warnings/errors using -Wall -ansi -pedantic
+* Port to: Linux/SVGAlib, Linux/X, Linux/OpenGL, DOS/Allegro, Win32/GDI, 
+  Win32/DX, Win32/D3D, Win32/OpenGL, BeOS?, MacOS?
+* Ease in using demos. Playing demos from files, recording to files, batch
+  playing, and so on.

src/Makefile

 CC = gcc
 #CFLAGS = -Wall -O6 -fomit-frame-pointer -mpentiumpro -mcpu=pentiumpro -march=pentiumpro -DUSEVGA
-CFLAGS = -g -DUSEVGA -fwritable-strings
+CFLAGS = -g -DUSEVGA
 #CFLAGS = -Os -fwritable-strings
 #CFLAGS = -g -Wall -DUSEVGA -DDEBUG 
 #CFLAGS = -g -DUSEVGA -DDEBUG
@@ -10,7 +10,7 @@ OBJS = objs.o misc.o id_ca.o id_in.o id_sd.o id_vl.o id_vh.o id_us.o \
 	wl_inter.o wl_menu.o wl_play.o wl_state.o wl_text.o wl_main.o \
 	wl_debug.o
 
-LFLAGS = -lm -lvga 
+LFLAGS = -lm -lvga
 #LFLAGS = -lm -lvga ElectricFence-2.2.2/libefence.a -lpthread
 
 NASM = nasm

src/TODO

@@ -10,7 +10,12 @@ some sort of garbage collection
 the right place
 * every structure that is read/written must be PACKED, with datatypes
 specifically set! (ie, no int, but short or long int)
-* is that memory intro screen needed anymore? probably not
+* or at least have PACKED versions of read/write structures, and transfer
+to/from just for reading, so only not-packed structures are used during
+actual gameplay/etc. 
+* is that memory intro screen needed anymore? probably not, although it
+would be nice to show what version is loaded, but doom just printed text
+* then, what about PG13? OH NO!!!!
 * fix the input code, everything is spread out... ideally everything should
 work the same, let the input handler do it all instead
 * when viewsize is around 20, sprites end up being drawn over the border.
@@ -26,11 +31,10 @@ version than a spanish version
 * fix status bar gfx junk, and those tiles that do not wish to be extracted
 * Use either US_CheckParm or MS_CheckParm.
 * perhaps rename UPLOAD
-TOO MANY #IFDEF.
-and upload builds with lots of wl6 code anyway (sound references were just
-ifdefed
+* TOO MANY #IFDEFs
+* and upload builds with lots of wl6 code anyway (sound references were just
+ifndefed out)
 * verify if the sounds and graphics are correctly numbered, once again...
-* remove -fwritable-strings
 * find out why shareware version produces these messages:
 CA_FarRead only read 471 out of 1671
 Trying to free null audio chunk 207!

src/id_us.c

@@ -111,11 +111,12 @@ int US_CheckParm(char *parm,char **strings)
 //		supported.
 //
 ///////////////////////////////////////////////////////////////////////////
-void US_Print(char *s)
+void US_Print(char *str)
 {
-	char	c, *se;
-	word	w,h;
-
+	char c, *se, *s, *sz = strdup(str);
+	word w, h;
+	s = sz;
+	
 	while (*s)
 	{
 		se = s;
@@ -140,6 +141,8 @@ void US_Print(char *s)
 		else
 			PrintX += w;
 	}
+	
+	free(sz);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -228,10 +231,13 @@ void US_CPrintLine(char *s)
 //		supported.
 //
 ///////////////////////////////////////////////////////////////////////////
-void US_CPrint(char *s)
+void US_CPrint(char *str)
 {
-	char	c, *se;
-
+	/* Functions like to pass a string constant */
+	
+	char c, *se, *s, *sz = strdup(str);
+	s = sz;
+	
 	while (*s)
 	{
 		se = s;
@@ -248,6 +254,8 @@ void US_CPrint(char *s)
 			s++;
 		}
 	}
+	
+	free(sz);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -305,7 +313,7 @@ US_DrawWindow(word x,word y,word w,word h)
 //	USL_XORICursor() - XORs the I-bar text cursor. Used by US_LineInput()
 //
 ///////////////////////////////////////////////////////////////////////////
-static void USL_XORICursor(int x,int y,char *s,word cursor)
+static void USL_XORICursor(int x, int y, char *s, word cursor)
 {
 	static	boolean	status;		// VGA doesn't XOR...
 	char	buf[MaxString];

src/version.h

@@ -5,7 +5,7 @@
 /* WL6 = 1 */
 /* SDM = 2 */
 /* SOD = 3 */
-#define WMODE 3
+#define WMODE 1
 
 #if WMODE == 0
 /* #define SPEAR */