*** empty log message ***

src/doors/smurfcombat/GNUmakefile

@@ -11,7 +11,7 @@ include ${SRC_ROOT}/build/Common.gmake
 CFLAGS	+=	$(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS)
 LDFLAGS	+=	$(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS)
 CFLAGS	+=	-I$(SRC_ROOT)/odoors -I$(SRC_ROOT)/conio -I.
-LDFLAGS	+=	-L$(SRC_ROOT)/odoors
+LDFLAGS	+=	-L$(SRC_ROOT)/odoors/libs-`uname`
 
 $(SMURF): $(EXEODIR) $(OBJS) $(BUILD_DEPENDS)
 	@echo Linking $@
@@ -23,6 +23,7 @@ dist:: $(SMURF)
 	-mkdir dist
 	cp install.sh dist
 	cp $(SMURF) dist/smurf.`uname`
+	cp $(SRC_ROOT)/odoors/libs-`uname`/libODoors.so.6.2 dist/libODoors.so.`uname`
 	cp *.d0* dist
 	cp *.doc dist
 	cp *.txt dist

src/doors/smurfcombat/Makefile

@@ -16,6 +16,7 @@ $(SMURF): $(OBJS)
 dist:: $(SMURF)
 	-md dist
 	copy /Y $(SMURF) dist
+	copy /Y $(SRC_ROOT)\odoors\ODoors62.dll dist
 	copy /Y *.d0* dist
 	copy /Y *.doc dist
 	copy /Y *.txt dist

src/doors/smurfcombat/smurfbak.h

@@ -81,8 +81,10 @@ backgame(void)
     } fclose(stream);
     fprintf(stream, "%03i", noplayers);
     for (cyc = 0; cyc < noplayers; cyc++) {
+#ifdef TODO_LOCAL_DISPLAY
 	od_sleep(50);
 	cprintf(".");
+#endif
 	for (cyc2 = 0; cyc2 < 40; cyc2++)
 	    fprintf(stream, "%03i", realname[cyc][cyc2]);
 	fprintf(stream, "%010i", realnumb[cyc]);

src/doors/smurfcombat/smurfuar.c

@@ -14,9 +14,6 @@
 /***************************************************************************/
 
 #include "smurfext.h"
-#ifndef TODO_WRAPPERS
-#define strset(x,y)	memset(x,y,sizeof(x));
-#endif
 
 
 
@@ -76,8 +73,13 @@ userarena(void)
     numba--;
     enemyhp = smurfhpm[numba];
 
+#ifdef TODO_WRAPPERS
     strset(eweapon, 0);
     strset(earmor, 0);
+#else
+    memset(eweapon, 0, sizeof(eweapon));
+    memset(earmor, 0, sizeof(earmor));
+#endif
     sprintf(eweapon, "%s", smurfweap[numba]);
     sprintf(earmor, "%s", smurfarmr[numba]);
 
@@ -249,9 +251,17 @@ userarena(void)
 	    tw = 1;
 	    sprintf(eweapon, "%s", smurfweap[numba]);
 	    ew = smurfweapno[numba];
+#ifdef TODO_WRAPPERS
 	    strset(smurfweap[numba], 0);
+#else
+	    memset(smurfweap[numba], 0, sizeof(smurfweap[numba]));
+#endif
 	    sprintf(smurfweap[numba], "%s", smurfweap[thisuserno]);
+#ifdef TODO_WRAPPERS
 	    strset(smurfweap[thisuserno], 0);
+#else
+	    memset(smurfweap[thisuserno], 0, sizeof(smurfweap[thisuserno]));
+#endif
 	    sprintf(smurfweap[thisuserno], "%s", defweapon[smurfweapno[numba]]);
 	    smurfweapno[numba] = smurfweapno[thisuserno];
 	    smurfweapno[thisuserno] = ew;
@@ -261,9 +271,17 @@ userarena(void)
 	    ta = 1;
 	    sprintf(earmor, "%s", smurfarmr[numba]);
 	    ew = smurfarmrno[numba];
+#ifdef TODO_WRAPPERS
 	    strset(smurfarmr[numba], 0);
+#else
+	    memset(smurfarmr[numba], 0, sizeof(smurfarmr[numba]));
+#endif
 	    sprintf(smurfarmr[numba], "%s", smurfarmr[thisuserno]);
+#ifdef TODO_WRAPPERS
 	    strset(smurfarmr[thisuserno], 0);
+#else
+	    memset(smurfarmr[thisuserno], 0, sizeof(smurfarmr[thisuserno]));
+#endif
 	    sprintf(smurfarmr[thisuserno], "%s", defarmor[smurfarmrno[numba]]);
 	    smurfarmrno[numba] = smurfarmrno[thisuserno];
 	    smurfarmrno[thisuserno] = ew;
@@ -339,9 +357,17 @@ userarena(void)
 	smurfexper[thisuserno] = (smurfexper[thisuserno] + ef);
 	if (smurfweapno[thisuserno] < smurfweapno[numba]) {
 	    tw = 1;
+#ifdef TODO_WRAPPERS
 	    strset(smurfweap[thisuserno], 0);
+#else
+	    memset(smurfweap[thisuserno], 0, sizeof(smurfweap[thisuserno]));
+#endif
 	    sprintf(smurfweap[thisuserno], "%s", eweapon);
+#ifdef TODO_WRAPPERS
 	    strset(smurfweap[numba], 0);
+#else
+	    memset(smurfweap[numba], 0, sizeof(smurfweap[numba]));
+#endif
 	    sprintf(smurfweap[numba], "%s", defweapon[smurfweapno[thisuserno]]);
 	    smurfweapno[numba] = smurfweapno[thisuserno];
 	    smurfweapno[thisuserno] = ew / 5;
@@ -349,9 +375,17 @@ userarena(void)
 	}
 	if (smurfarmrno[thisuserno] < smurfarmrno[numba]) {
 	    ta = 1;
+#ifdef TODO_WRAPPERS
 	    strset(smurfarmr[thisuserno], 0);
+#else
+	    memset(smurfarmr[thisuserno], 0, sizeof(smurfarmr[thisuserno]));
+#endif
 	    sprintf(smurfarmr[thisuserno], "%s", earmor);
+#ifdef TODO_WRAPPERS
 	    strset(smurfarmr[numba], 0);
+#else
+	    memset(smurfarmr[numba], 0, sizeof(smurfarmr[numba]));
+#endif
 	    sprintf(smurfarmr[numba], "%s", defarmor[smurfarmrno[thisuserno]]);
 	    smurfarmrno[numba] = smurfarmrno[thisuserno];
 	    smurfarmrno[thisuserno] = aw / 4;