WebSVN – Games.Carmageddon – Diff – /src/DETHRACE/common/utility.c

 #include <stdlib.h>
-#include "brender/brender.h"
+#include "brender.h"
 #include "constants.h"
 #include "errors.h"
 #include "globvars.h"
 #include "globvrpb.h"
 #include "graphics.h"
     the_map = BrPixelmapLoad(pFile_name);
     if (the_map != NULL) {
         the_map->origin_x = 0;
         the_map->origin_y = 0;
-#if !defined(DETHRACE_FIX_BUGS)
         the_map->row_bytes = (the_map->row_bytes + sizeof(int32_t) - 1) & ~(sizeof(int32_t) - 1);
-#endif
+    }
     return the_map;
+}
 // IDA: br_uint_32 __usercall DRPixelmapLoadMany@<EAX>(char *pFile_name@<EAX>, br_pixelmap **pPixelmaps@<EDX>, br_uint_16 pNum@<EBX>)
     //br_uint_8 lobyte; // Pierre-Marie Baty -- unused variable
     LOG_TRACE("(\"%s\", %p, %d)", pFile_name, pPixelmaps, pNum);
     number_loaded = BrPixelmapLoadMany(pFile_name, pPixelmaps, pNum);
     for (i = 0; i < number_loaded; i++) {
         the_map = pPixelmaps[i];
-#if !defined(DETHRACE_FIX_BUGS)
         the_map->row_bytes = (the_map->row_bytes + sizeof(int32_t) - 1) & ~(sizeof(int32_t) - 1);
-#endif
         the_map->base_x = 0;
         the_map->base_y = 0;
+    }
     return number_loaded;
 }
 // IDA: void __usercall WaitFor(tU32 pDelay@<EAX>)
 void WaitFor(tU32 pDelay) {
     tU32 start_time;
     LOG_TRACE("(%d)", pDelay);
     start_time = PDGetTotalTime();
     while (start_time + pDelay < (tU32) PDGetTotalTime()) { // Pierre-Marie Baty -- added type cast
         SoundService();
     }
+}
 // IDA: br_uint_32 __usercall DRActorEnumRecurse@<EAX>(br_actor *pActor@<EAX>, br_actor_enum_cbfn *callback@<EDX>, void *arg@<EBX>)
-intptr_t DRActorEnumRecurse(br_actor* pActor, br_actor_enum_cbfn* callback, void* arg) {
+br_uintptr_t DRActorEnumRecurse(br_actor* pActor, br_actor_enum_cbfn* callback, void* arg) {
-    intptr_t result;
+    br_uintptr_t result;
     result = callback(pActor, arg);
     if (result != 0) {
         return result;
     }
     for (pActor = pActor->children; pActor != NULL; pActor = pActor->next) {
         result = DRActorEnumRecurse(pActor, callback, arg);
         if (result != 0) {
             return result;
+        }
+    }
     return 0;
+}
 // IDA: br_uint_32 __cdecl CompareActorID(br_actor *pActor, void *pArg)
-intptr_t CompareActorID(br_actor* pActor, void* pArg) {
+br_uintptr_t CompareActorID(br_actor* pActor, void* pArg) {
     LOG_TRACE("(%p, %p)", pActor, pArg);
     if (pActor->identifier && !strcmp(pActor->identifier, (const char*)pArg)) {
         return (intptr_t)pActor;
     } else {
     if (result != 0) {
         return result;
+    }
     for (pActor = pActor->children; pActor != NULL; pActor = pActor->next) {
         result = DRActorEnumRecurseWithMat(pActor, pMat, pCall_back, pArg);
         if (result != 0) {
             return result;
         }
     }
     return 0;
+}
 // IDA: br_uint_32 __usercall DRActorEnumRecurseWithTrans@<EAX>(br_actor *pActor@<EAX>, br_matrix34 *pMatrix@<EDX>, br_uint_32 (*pCall_back)(br_actor*, br_matrix34*, void*)@<EBX>, void *pArg@<ECX>)
 br_uint_32 DRActorEnumRecurseWithTrans(br_actor* pActor, br_matrix34* pMatrix, br_uint_32 (*pCall_back)(br_actor*, br_matrix34*, void*), void* pArg) {
     br_uint_32 result;
     time = PDGetTotalTime();
     if (time - last_service > MIN_SERVICE_INTERVAL && !gProgram_state.racing) {
         SoundService();
         NetService(gProgram_state.racing);
         last_service = time;
     }
 }
 // IDA: void __usercall DRMatrix34TApplyP(br_vector3 *pA@<EAX>, br_vector3 *pB@<EDX>, br_matrix34 *pC@<EBX>)
 void DRMatrix34TApplyP(br_vector3* pA, br_vector3* pB, br_matrix34* pC) {
     br_scalar t1;
     br_scalar t2;
     br_scalar t3;
+    }
+}
 // IDA: void __cdecl SubsStringJob(char *pStr, ...)
 void SubsStringJob(char* pStr, ...) {
-    //char* sub_str; // Pierre-Marie Baty -- unused variable
+    char* sub_str;
-    //char temp_str[256]; // Pierre-Marie Baty -- unused variable
+    char temp_str[256];
-    //char* sub_pt; // Pierre-Marie Baty -- unused variable
+    char* sub_pt;
-    //va_list ap; // Pierre-Marie Baty -- unused variable
+    va_list ap;
     LOG_TRACE("(\"%s\")", pStr);
+    va_start(ap, pStr);
+    for (;;) {
+        sub_pt = strchr(pStr, '%');
+        if (sub_pt == NULL) {
-    NOT_IMPLEMENTED();
+            va_end(ap);
+            return;
+        }
+        sub_str = va_arg(ap, char *);
+        StripCR(sub_str);
+        strcpy(temp_str, &sub_pt[1]);
+        strcpy(sub_pt, sub_str);
+        strcat(pStr, temp_str);
+    }
+}
 // IDA: void __usercall DecodeLine2(char *pS@<EAX>)
 void DecodeLine2(char* pS) {
     int len;

Subversion Repositories Games.Carmageddon

Games.Carmageddon/src/DETHRACE/common/utility.c – Rev 11 → 18