Commit 87d42d14 authored by Steven Fuller's avatar Steven Fuller

Fixed SOD compiliation.

parent 02cae373
...@@ -19,6 +19,8 @@ NASM = nasm ...@@ -19,6 +19,8 @@ NASM = nasm
all: wolf3d all: wolf3d
$(OBJS): version.h id_heads.h
.asm.o: .asm.o:
$(NASM) -f elf -o $@ $< $(NASM) -f elf -o $@ $<
......
* inconsistancy: * inconsistancy:
id_ca.c has code for setting the extension to load files id_ca.c has code for setting the extension to load files
so does wl_menu.c so does wl_menu.c
* would it not make sense to remove bufferseg from id_ca.c?
* menu code is a mess, always does things differently than the rest of the * menu code is a mess, always does things differently than the rest of the
code, it really needs to be cleaned up code, it really needs to be cleaned up
* id_ca.c cache code: nice idea but messy and maybe can be fixed * id_ca.c cache code: nice idea but messy and maybe can be fixed
in an effort to not allocate everything to memory and forget about it in an effort to not allocate everything to memory and forget about it
some sort of garbage collection
* remove virtualreality * remove virtualreality
* clean up header files, especially wl_def.h, where some externs arent in * clean up header files, especially wl_def.h, where some externs arent in
the right place the right place
* every structure that is read/written must be PACKED, with datatypes * every structure that is read/written must be PACKED, with datatypes
specifically set! (ie, no int, but short or long int) specifically set! (ie, no int, but short or long int)
* is that memory intro screen needed anymore? probably not
...@@ -45,6 +45,18 @@ long filelength(int handle) ...@@ -45,6 +45,18 @@ long filelength(int handle)
return buf.st_size; return buf.st_size;
} }
char *strlwr(char *s)
{
char *p = s;
while (*p) {
*p = tolower(*p);
p++;
}
return s;
}
char *itoa(short int value, char *string, int radix) char *itoa(short int value, char *string, int radix)
{ {
/* wolf3d only uses radix 10 */ /* wolf3d only uses radix 10 */
......
...@@ -9,6 +9,10 @@ unsigned long get_TimeCount(); ...@@ -9,6 +9,10 @@ unsigned long get_TimeCount();
long filelength(int handle); long filelength(int handle);
#define stricmp strcasecmp
#define strnicmp strncasecmp
char *strlwr(char *s);
char *itoa(short int value, char *string, int radix); char *itoa(short int value, char *string, int radix);
char *ltoa(long value, char *string, int radix); char *ltoa(long value, char *string, int radix);
char *ultoa(unsigned long value, char *string, int radix); char *ultoa(unsigned long value, char *string, int radix);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
/* WL6 = 1 */ /* WL6 = 1 */
/* SDM = 2 */ /* SDM = 2 */
/* SOD = 3 */ /* SOD = 3 */
#define WMODE 1 #define WMODE 3
#if WMODE == 0 #if WMODE == 0
/* #define SPEAR */ /* #define SPEAR */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment