Fixes for Wokna ... part I

Author: Marek

blit.c

@@ -268,10 +268,10 @@ blit_screen(unsigned char ignore_bg)
 				break;
 			}
 			/* draw bigger pieces to screen */
-			line_buf[x] = sc[off = x + yof] ? : 32;
+			line_buf[x] = sc[off = x + yof] ? sc[off = x + yof] : 32;
 			for (s = x++; x < SCREEN_X && at[off = x + yof] == attribute &&
 					at_old[off] == attribute_old; x++)
-					line_buf[x] = sc[off] ? : 32;
+					line_buf[x] = sc[off] ? sc[off] : 32;
 			last_color = attribute;
 			c_print_l(line_buf + s, x---s);
 		}

bot.c

@@ -1042,7 +1042,7 @@ void parse_command_line(int argc,char **argv)
 			break;
 
 			case 'p':
-			port=strtoul(optarg,&e,10);
+			port=(unsigned short)strtoul(optarg,&e,10);
 			if (*e){ERROR("Error: Decimal number expected.\n");EXIT(1);}
 			break;
                 }
@@ -1099,11 +1099,7 @@ int main(int argc,char **argv)
 	ERROR("Initialization...\n");
 
 	last_obj=&objects;
-#ifndef WIN32
 	srandom(get_time());
-#else
-	srand(get_time());
-#endif
 
 	const1=random()%50;
 	const2=random()%20;

cfg.h

@@ -21,8 +21,6 @@
 
 #define DEFAULT_FONT_NAME "-misc-fixed-bold-r-normal-*-13-*-*-*-c-*-iso8859-*"
 
-
-#define DATA_PATH "data/"
 #define LEVEL_FILE "level.dat"
 #define GAME_SPRITES_FILE "sprites.dat"
 #define BANNER_FILE "banner.dat"
@@ -152,7 +150,11 @@ extern int tri_d;
 		#define EXIT(a)		{exit(a);}
 	#endif
 	#define random		rand
+	#define BASE_DIR	"."
+	#define DATA_PATH "data\\"
 #else
+	#define DATA_PATH "data/"
+
 	#define long_long	long long
 	#ifdef CLIENT
 		#define ERROR(a)	{if (!console_ok)c_shutdown();fprintf(stderr,a);}

client.c

@@ -3,7 +3,6 @@
 #ifndef WIN32
 #include "config.h"
 #endif
-
 #include <stdio.h>
 #include <signal.h>
 #include <math.h>
@@ -242,10 +241,11 @@ int load_cfg(struct config *cfg)
 
 #ifndef WIN32
 	snprintf(txt, sizeof(txt), "%s/%s",getenv("HOME"),CFG_FILE);
+	stream=fopen(txt,"r");
 #else
-	snprintf(txt, sizeof(txt), "./%s",CFG_FILE);
+	snprintf(txt, sizeof(txt), "./%s", CFG_FILE);
+	fopen_s(&stream, txt, "r");
 #endif
-	stream=fopen(txt,"r");
 	if (!stream)
 		return load_default_cfg(cfg, 1);
 
@@ -299,7 +299,11 @@ void save_cfg(struct config *cfg)
 			dcfg.color = cfg->color;
 	}
 
+#ifndef WIN32
 	stream=fopen(txt,"w");
+#else
+	fopen_s(&stream, txt, "w");
+#endif
 	if (!stream)
 		return;
 	fprintf(stream, "%s\n%s\n%d\n%d\n", dcfg.host, dcfg.name,
@@ -1056,9 +1060,9 @@ void change_level(void)
 	reinit_area();
 
 	LEVEL=load_level(level_number);
-	snprintf(txt,256,"%s%s%s",DATA_PATH,LEVEL,LEVEL_SPRITES_SUFFIX);
+	snprintf(txt,sizeof(txt),"%s%s%s",DATA_PATH,LEVEL,LEVEL_SPRITES_SUFFIX);
 	load_sprites(txt);
-	snprintf(txt,256,"%s%s%s",DATA_PATH,LEVEL,STATIC_DATA_SUFFIX);
+	snprintf(txt,sizeof(txt),"%s%s%s",DATA_PATH,LEVEL,STATIC_DATA_SUFFIX);
 	load_data(txt);
 	mem_free(LEVEL);
 }
@@ -1309,8 +1313,7 @@ int process_packet(char *packet,int l)
 			a=get_int(packet+1);
 			if (level_number==a)goto level_changed;
 			level_number=a;
-			snprintf(txt,256, "Trying to change level to number %d",
-				level_number);
+			snprintf(txt, sizeof(txt), "Trying to change level to number %d", level_number);
 			add_message(txt, M_INFO);
 			name=load_level(level_number);
 			if (!name) {
@@ -1617,7 +1620,11 @@ void load_banner(char **banner)
 	char line[1025];
 	int a,b;
 
+#ifndef WIN32
 	s=fopen(DATA_PATH BANNER_FILE,"r");
+#else
+	fopen_s(&s,DATA_PATH BANNER_FILE,"r");
+#endif
 	if (!s){shut_down(0);ERROR("Error: Can't load file \""DATA_PATH BANNER_FILE"\".\n");EXIT(1);}
 	*banner=mem_alloc(1);
 	**banner=0;
@@ -2243,7 +2250,12 @@ int main(int argc,char **argv)
 	if (!set_size)c_get_size(&SCREEN_X,&SCREEN_Y);
 	init_sprites();
 	init_area();
+#ifndef WIN32
 	load_sprites(DATA_PATH GAME_SPRITES_FILE);
+#else
+	snprintf(txt,sizeof(txt),"%s\\data\\sprites.dat",_getcwd(NULL, 0));
+	load_sprites(txt);
+#endif
 	/* sprites are stored in memory in this order: game sprites (players,
 	 * bullets, corpses, blood, meat...) followed by level sprites 
 	 */

data.c

@@ -190,7 +190,11 @@ void load_data(char * filename)
  int n,x,y;
  int t;
 
+#ifndef WIN32
  if (!(stream=fopen(filename,"rb")))
+#else
+ if (!fopen_s(&stream,filename,"rb"))
+#endif
  {
 	char msg[256];
  	snprintf(msg,256,"Can't open file \"%s\"!\n",filename);
@@ -234,12 +238,17 @@ void load_data(char * filename)
 void load_sprites(char * filename)
 {
  FILE *stream;
- static char line[1024];
+ char line[1024];
  char *p,*q;
  int l;
 
- stream=fopen(filename,"rb");
- if (!stream)
+#ifndef WIN32
+ if(!(stream=fopen(filename,"rb")))
+#else
+ int err;
+ char r[1024];
+ if((err = fopen_s(&stream,filename,"rb")) != 0)
+#endif
  {
  	char msg[256];
 	snprintf(msg,256,"Can't open file \"%s\"!\n",filename);
@@ -263,7 +272,13 @@ void load_sprites(char * filename)
   if (!sprite_names[n_sprites-1]){ERROR("Memory allocation error!\n");EXIT(1);}
   memcpy(sprite_names[n_sprites-1],q,l+1);
   _skip_ws(&p);
-  for (q=p;(*p)!=' '&&(*p)!=9&&(*p)!=10&&(*p);p++);
+  for (q=p;(*p)!=' '&&(*p)!=9&&(*p)!=10&&(*p);p++)
+#ifdef WIN32
+	  if (*p == '/')
+		  *p = '\\';
+  snprintf(r, sizeof(r), "%s\\%s", _getcwd(NULL, 0), q)
+#endif
+;
   *p=0;p++;
   load_sprite(q,sprites+(n_sprites-1));
  }
@@ -297,8 +312,14 @@ char *load_level(int level_num)
 	int a;
 	FILE *f;
 
-	f=fopen(DATA_PATH LEVEL_FILE,"r");
-	if (!f)return NULL;
+#ifndef WIN32
+	if(!(f=fopen(DATA_PATH LEVEL_FILE,"r")))
+#else
+	int err;
+	snprintf(txt,sizeof(txt),"%s\\data\\level.dat",_getcwd(NULL, 0));
+	if((err = fopen_s(&f, txt, "r")) != 0)
+#endif
+	return NULL;
 
 	for (a=0;a<=level_num;)
 	{
@@ -607,8 +628,15 @@ char* md5_level(int level_num)
 	{
 		FILE *f;
 
-		f=fopen(p,"r");
-		if (!f){mem_free(result);return NULL;}
+#ifndef WIN32
+		if(!(f=fopen(p,"r")))
+#else
+		if(!fopen_s(&f, p, "r"))
+#endif
+		{
+			mem_free(result);
+			return NULL;
+		}
 		while (fgets(p,2048,f))
 		{
 			if (p[strlen(p)-1]==13)p[strlen(p)-1]=0;
@@ -635,8 +663,13 @@ static int r_access(const char *filename)
 #ifdef HAVE_ACCESS
 	return !access(filename, R_OK);
 #else
-	FILE *f = fopen(filename, "r");
-	if (f) {
+	FILE *f;
+#ifndef WIN32
+	if(f = fopen(filename, "r"))
+#else
+	if(fopen_s(&f, filename, "r"))
+#endif
+	{
 		fclose(f);
 		return 1;
 	}

data.h

@@ -3,6 +3,16 @@
 
 #ifndef WIN32
 #include "config.h"
+#else
+/* rezim kompatibility s woknama ... */
+#include <direct.h>
+#define snprintf(t, s, ...) _snprintf_s(t, s, s, __VA_ARGS__)
+#define close(...) while(0);
+#define chdir(...) _chdir(__VA_ARGS__)
+#define random rand
+#define srandom(x) srand((unsigned int)x)
+#define sleep(x) Sleep(x)
+#define strcat(d, s) strcat_s(d, sizeof(s), s)
 #endif
 #include "cfg.h"
 #include "sprite.h"

error.c

@@ -5,11 +5,14 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
+#ifndef WIN32
 #include <unistd.h>
-
 #include "config.h"
+#endif
+
 #include "cfg.h"
 #include "error.h"
+#include "data.h"
 
 struct memory_list {
 	int n;
@@ -128,12 +131,14 @@ void er(int b, char *m, va_list l)
 	sleep(1);
 }
 
+#ifndef WIN32
 void error(char *m, ...)
 {
 	va_list l;
 	va_start(l, m);
 	er(1, m, l);
 }
+#endif
 
 int errline;
 unsigned char *errfile;

error.h

@@ -5,14 +5,22 @@
 
 
 #include "cfg.h"
+#ifndef WIN32
 #include "config.h"
+#else
+#define inline __inline
+#endif
 #include <string.h>
 
 #define DUMMY ((void *)-1L)
 
 void do_not_optimize_here(void *p);
 void check_memory_leaks(void);
+#ifndef WIN32
 void error(char *, ...);
+#else
+#define error(...) while(0);
+#endif
 void debug_msg(char *, ...);
 void int_error(char *, ...);
 extern int errline;

md5hl.c

@@ -12,7 +12,9 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 
 #include <errno.h>
 #include <stdio.h>
@@ -46,16 +48,23 @@ MD5File (const char *filename, char *buf)
 {
     unsigned char buffer[BUFSIZ];
     MD5_CTX ctx;
-    int f,i,j;
+    int i,j;
+	FILE *f;
 
     MD5Init(&ctx);
-    f = open(filename,O_RDONLY);
-    if (f < 0) return 0;
-    while ((i = read(f,buffer,sizeof buffer)) > 0) {
+
+#ifndef WIN32
+    if (!(f = fopen(filename, "r")))
+#else
+	printf("%s\n", filename);for(;;);
+	if (fopen_s(&f, filename, "r") != 0) /* tady to hnije .. */
+#endif
+	return 0;
+    while ((i = fread(buffer,sizeof buffer,1,f)) > 0) {
 	MD5Update(&ctx,buffer,i);
     }
     j = errno;
-    close(f);
+    fclose(f);
     errno = j;
     if (i < 0) return 0;
     return MD5End(&ctx, buf);