diff --git a/src/BRSRC13/CORE/FW/brlists.c b/src/BRSRC13/CORE/FW/brlists.c index 19cca364..edde8903 100644 --- a/src/BRSRC13/CORE/FW/brlists.c +++ b/src/BRSRC13/CORE/FW/brlists.c @@ -54,12 +54,9 @@ void BrSimpleNewList(br_simple_list* list) { // Offset: 628 // Size: 76 void BrSimpleAddHead(br_simple_list* list, br_simple_node* node) { - printf("BrSimpleAddHead %p\n", &node); node->next = list->head; - printf("setting me %p ->prev = %p\n", node, &list->head); node->prev = list; if (node->next) { - printf("setting %p ->prev = %p\n", node->next, node); node->next->prev = node; } list->head = node; diff --git a/src/BRSRC13/CORE/FW/fwsetup.c b/src/BRSRC13/CORE/FW/fwsetup.c index 819d60ed..60866b80 100644 --- a/src/BRSRC13/CORE/FW/fwsetup.c +++ b/src/BRSRC13/CORE/FW/fwsetup.c @@ -15,7 +15,6 @@ #include #include -br_image Image_BRCORE1; br_framework_state fw; void* functionPointers_BRCORE1[185]; char* namePointers_BRCORE1[185]; @@ -48,6 +47,25 @@ br_resource_class fw_resourceClasses[25] = { }; br_uint_16 nameOrdinals_BRCORE1[185]; + +br_image Image_BRCORE1 = { + {}, + "BRCORE1", + 2, + 0, + 1, + 185, + &functionPointers_BRCORE1, + 185, + &namePointers_BRCORE1, + nameOrdinals_BRCORE1, + 0, + NULL, + 0, + NULL, + NULL +}; + char rscid[53]; #define NBR_DEV_SLOTS 16 @@ -70,7 +88,6 @@ br_error BrFwBegin() { fw.open_mode = 0; BrRegistryNew(&fw.reg_resource_classes); - printf("here21\n"); fw.resource_class_index[BR_MEMORY_REGISTRY] = &fw_resourceClasses[0]; fw.resource_class_index[BR_MEMORY_ANCHOR] = &fw_resourceClasses[1]; fw.res = BrResAllocate(0, 0, BR_MEMORY_ANCHOR); diff --git a/src/BRSRC13/CORE/FW/resource.c b/src/BRSRC13/CORE/FW/resource.c index e0255e9c..cb4530a0 100644 --- a/src/BRSRC13/CORE/FW/resource.c +++ b/src/BRSRC13/CORE/FW/resource.c @@ -33,12 +33,10 @@ void* BrResAllocate(void* vparent, br_size_t size, br_uint_8 res_class) { br_int_32 actual_pad; br_int_32 actual_pad_2; - char* tmp; malign = BrMemAlign(res_class) - 1; - //LOWORD(size_plus_header_plus_3) = (size + 27) & 0xFFFC; - printf("BrResAllocate: parent: %p, size: %d, class: %d, class_index: %p\n", vparent, size, res_class, fw.resource_class_index[res_class]); + //printf("BrResAllocate: parent: %p, size: %d, class: %d, class_index: %p\n", vparent, size, res_class, fw.resource_class_index[res_class]); calign = fw.resource_class_index[res_class]->alignment; if (calign <= 0) { calign = 4; @@ -49,8 +47,9 @@ void* BrResAllocate(void* vparent, br_size_t size, br_uint_8 res_class) { pad = (~malign & calign) + 3; actual_pad = (sizeof(resource_header) + pad) & 0xFFFC; actual_pad_2 = (size + sizeof(resource_header) + 3) & 0xFFFC; - printf("pad: %d, %d, %d\n", malign, calign, pad); + res = (resource_header*)BrMemAllocate(size + actual_pad, res_class); + // TOOD: ? // if ((signed int)(((unsigned int)((char*)allocated + res_align_1) & ~res_align_1) - (_DWORD)allocated) > v8) // BrFailure((int)"Memory allocator broke alignment", v14); res->class = res_class; @@ -69,7 +68,7 @@ void* BrResAllocate(void* vparent, br_size_t size, br_uint_8 res_class) { parent = (resource_header*)(tmp - sizeof(resource_header)); BrSimpleAddHead(&parent->children, &res->node); } - printf("BrResAllocate returning res: %p, pad: %d, result: %p\n", res, pad, ((char*)res) + actual_pad); + //printf("BrResAllocate returning res: %p, pad: %d, result: %p\n", res, pad, ((char*)res) + actual_pad); return ((char*)res) + actual_pad; } diff --git a/src/BRSRC13/CORE/FW/resreg.c b/src/BRSRC13/CORE/FW/resreg.c index b52d272e..26aa4099 100644 --- a/src/BRSRC13/CORE/FW/resreg.c +++ b/src/BRSRC13/CORE/FW/resreg.c @@ -12,13 +12,12 @@ char rscid[48]; br_resource_class* BrResClassAdd(br_resource_class* rclass) { br_resource_class* r; - printf("BrResClassAdd (1) id: %s, %d = %p\n", rclass->identifier, rclass->res_class, fw.resource_class_index[rclass->res_class]); + //printf("BrResClassAdd: id: %s, %d = %p\n", rclass->identifier, rclass->res_class, fw.resource_class_index[rclass->res_class]); r = BrRegistryAdd(&fw.reg_resource_classes, rclass); if (!r) { return NULL; } - printf("BrResClassAdd (2) %d = %p\n", rclass->res_class, r); fw.resource_class_index[rclass->res_class] = r; return r; } diff --git a/src/BRSRC13/CORE/FW/sys_conf.c b/src/BRSRC13/CORE/FW/sys_conf.c index 6c93f559..38214e5a 100644 --- a/src/BRSRC13/CORE/FW/sys_conf.c +++ b/src/BRSRC13/CORE/FW/sys_conf.c @@ -16,7 +16,7 @@ br_boolean Is_Valid_Sys_Config_Token(br_token t) { // EDX: section_name // EBX: t // ECX: Entry -br_boolean LoadIniEntry(char *ini_file, char *section_name, br_token t, char *Entry) { +br_boolean LoadIniEntry(char* ini_file, char* section_name, br_token t, char* Entry) { char Temp[255]; br_uint_16 size; br_value v; @@ -27,7 +27,7 @@ br_boolean LoadIniEntry(char *ini_file, char *section_name, br_token t, char *En // Size: 213 // EAX: ini_file // EDX: section_name -br_error LoadIniConfig(char *ini_file, char *section_name) { +br_error LoadIniConfig(char* ini_file, char* section_name) { } // Offset: 520 @@ -36,7 +36,7 @@ br_error LoadIniConfig(char *ini_file, char *section_name) { // EDX: hKey // EBX: t // ECX: Entry -br_boolean LoadRegistryEntry(char *Reg_Path, void *hKey, br_token t, char *Entry) { +br_boolean LoadRegistryEntry(char* Reg_Path, void* hKey, br_token t, char* Entry) { char Temp[255]; br_uint_16 size; br_value v; @@ -47,14 +47,14 @@ br_boolean LoadRegistryEntry(char *Reg_Path, void *hKey, br_token t, char *Entry // Size: 224 // EAX: Reg_Path // EDX: hKey -br_error LoadRegistryConfig(char *Reg_Path, void *hKey) { +br_error LoadRegistryConfig(char* Reg_Path, void* hKey) { } // Offset: 912 // Size: 193 // EAX: t // EDX: Entry -br_error BrSetDefaultConfig(br_token t, char *Entry) { +br_error BrSetDefaultConfig(br_token t, char* Entry) { char Reg_Path[255]; int v0; int v1; @@ -71,20 +71,19 @@ br_error BrSystemConfigBegin() { // Offset: 1472 // Size: 188 -br_error BrSystemConfigLoad(br_token t, char *Param1, void *Param2) { +br_error BrSystemConfigLoad(br_token t, char* Param1, void* Param2) { br_error r; } // Offset: 1684 // Size: 158 -br_error BrSystemConfigSetString(br_token t, char *string) { +br_error BrSystemConfigSetString(br_token t, char* string) { br_value v; } // Offset: 1868 // Size: 175 -br_error BrSystemConfigQueryString(br_token t, char *string, int max_size) { +br_error BrSystemConfigQueryString(br_token t, char* string, int max_size) { br_error r; br_value v; } - diff --git a/src/BRSRC13/CORE/PIXELMAP/pmsetup.c b/src/BRSRC13/CORE/PIXELMAP/pmsetup.c index 0495a9bc..8f64aefa 100644 --- a/src/BRSRC13/CORE/PIXELMAP/pmsetup.c +++ b/src/BRSRC13/CORE/PIXELMAP/pmsetup.c @@ -1,19 +1,35 @@ #include "pmsetup.h" +#include "CORE/FW/resource.h" +#include "CORE/FW/resreg.h" +#include "CORE/STD/brstdlib.h" +#include "image.h" +#include +#include br_image Image_BRPMAP1; -br_resource_class resourceClasses[2]; -void *functionPointers_BRPMAP1[77]; -char *namePointers_BRPMAP1[77]; +br_resource_class pm_resourceClasses[2] = { + { 0u, "PIXELMAP", BR_MEMORY_PIXELMAP, NULL, 0u }, + { 0u, "PIXELS", BR_MEMORY_PIXELS, NULL, 32u } +}; +void* functionPointers_BRPMAP1[77]; +char* namePointers_BRPMAP1[77]; br_pixelmap_state _pixelmap; br_uint_16 nameOrdinals_BRPMAP1[77]; // Offset: 16 // Size: 130 void BrPixelmapBegin() { + int i; + + BrMemSet(&_pixelmap, 0, sizeof(br_pixelmap_state)); + _pixelmap.res = BrResAllocate(0, 0, BR_MEMORY_ANCHOR); + for (i = 0; i < 2; i++) { + BrResClassAdd(&pm_resourceClasses[i]); + } + return BrImageAdd(&Image_BRPMAP1); } // Offset: 160 // Size: 76 void BrPixelmapEnd() { } - diff --git a/src/BRSRC13/br_types.h b/src/BRSRC13/br_types.h index a63a78d0..c2982cca 100644 --- a/src/BRSRC13/br_types.h +++ b/src/BRSRC13/br_types.h @@ -1456,6 +1456,7 @@ typedef struct br_list { typedef struct br_simple_node br_simple_node; typedef struct br_simple_node { br_simple_node* next; + // TODO: We changed this from "** prev" to "*prev". Is this really correct? br_simple_node* prev; } br_simple_node; diff --git a/src/DETHRACE/common/drmem.c b/src/DETHRACE/common/drmem.c index b0b18dc6..20112981 100644 --- a/src/DETHRACE/common/drmem.c +++ b/src/DETHRACE/common/drmem.c @@ -1,7 +1,9 @@ #include "drmem.h" +#include "CORE/FW/resreg.h" +#include "errors.h" br_resource_class gStainless_classes[118]; -char *gMem_names[247]; +char* gMem_names[247]; int gNon_fatal_allocation_errors; br_allocator gAllocator; @@ -23,7 +25,7 @@ int AllocationErrorsAreFatal() { // Offset: 156 // Size: 34 void MAMSInitMem() { - FILE *f; + FILE* f; tPath_name the_path; } @@ -31,20 +33,20 @@ void MAMSInitMem() { // Size: 38 // EAX: pFlags // EDX: pTitle -void PrintMemoryDump(int pFlags, char *pTitle) { +void PrintMemoryDump(int pFlags, char* pTitle) { } // Offset: 232 // Size: 169 void* DRStdlibAllocate(br_size_t size, br_uint_8 type) { - void *p; + void* p; int i; char s[256]; } // Offset: 404 // Size: 38 -void DRStdlibFree(void *mem) { +void DRStdlibFree(void* mem) { int i; } @@ -66,22 +68,29 @@ void InstallDRMemCalls() { // Offset: 572 // Size: 59 // EAX: pPtr -void MAMSUnlock(void **pPtr) { +void MAMSUnlock(void** pPtr) { } // Offset: 632 // Size: 37 // EAX: pPtr -void MAMSLock(void **pPtr) { +void MAMSLock(void** pPtr) { } // Offset: 672 // Size: 124 void CreateStainlessClasses() { + int i; + + for (i = 0; i < 118; i++) { + gStainless_classes[i + 129].res_class = i; + if (!BrResClassAdd(&gStainless_classes[i + 129])) { + FatalError(94); + } + } } // Offset: 796 // Size: 34 void CheckMemory() { } - diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c index 9ae34511..22b4dbf5 100644 --- a/src/DETHRACE/common/graphics.c +++ b/src/DETHRACE/common/graphics.c @@ -1,16 +1,18 @@ #include "graphics.h" +#include + int gArrows[2][4][60]; int gMap_colours[4]; br_vector3 gShadow_points[8]; tConcussion gConcussion; tClip_details gShadow_clip_planes[8]; br_matrix34 gSheer_mat; -br_actor *gLollipops[100]; +br_actor* gLollipops[100]; tWobble_spec gWobble_array[5]; br_matrix34 gIdentity34; tSaved_table gSaved_shade_tables[100]; -int *gCursor_giblet_sequences[4]; +int* gCursor_giblet_sequences[4]; int gCursor_y_offsets[8]; int gCursor_x_offsets[8]; tCursor_giblet gCursor_giblets[45]; @@ -18,11 +20,11 @@ int gCursor_gib_x_offsets[8]; int gCursor_gib_y_offsets[8]; tTransient_bm gTransient_bitmaps[50]; float gCosine_array[64]; -br_pixelmap *gCursors[8]; -br_pixelmap *gCursor_giblet_images[18]; +br_pixelmap* gCursors[8]; +br_pixelmap* gCursor_giblet_images[18]; br_scalar gShadow_hither_min_move; -br_pixelmap *gEval_1; -br_pixelmap *gEval_2; +br_pixelmap* gEval_1; +br_pixelmap* gEval_2; br_vector3 gShadow_light_z; br_vector3 gShadow_light_x; int gShadow_dim_amount; @@ -32,36 +34,36 @@ br_vector3 gShadow_light_ray; br_scalar gShadow_hither_z_move; int gFancy_shadow; tShadow_level gShadow_level; -br_model *gShadow_model; -br_actor *gShadow_actor; +br_model* gShadow_model; +br_actor* gShadow_actor; int gShadow_clip_plane_count; -br_pixelmap *gPalette_conversion_table; -br_material *gShadow_material; +br_pixelmap* gPalette_conversion_table; +br_material* gShadow_material; int gSaved_table_count; int gCursor_giblet_sequence3[5]; int gCursor_giblet_sequence2[5]; -char *gFont_names[21]; +char* gFont_names[21]; int gCurrent_cursor_index; int gCursor_giblet_sequence1[5]; int gCursor_giblet_sequence0[7]; int gPalette_index; int gCursor_transient_index; -char *gScratch_pixels; -br_pixelmap *gScratch_palette; +char* gScratch_pixels; +br_pixelmap* gScratch_palette; int gPalette_munged; int gLast_palette_change; int gColourValues[1]; -br_pixelmap *gOrig_render_palette; +br_pixelmap* gOrig_render_palette; int gNext_transient; -br_pixelmap *gCurrent_palette; -br_pixelmap *gRender_palette; -br_pixelmap *gCurrent_splash; -br_pixelmap *gCurrent_conversion_table; +br_pixelmap* gCurrent_palette; +br_pixelmap* gRender_palette; +br_pixelmap* gCurrent_splash; +br_pixelmap* gCurrent_conversion_table; float gCamera_to_horiz_angle; int gColours[9]; -br_pixelmap *gFlic_palette; +br_pixelmap* gFlic_palette; tDR_font gFonts[21]; -char *gCurrent_palette_pixels; +char* gCurrent_palette_pixels; int gAR_fudge_headups; float gMap_render_x; float gMap_render_y; @@ -106,15 +108,15 @@ void ResetLollipopQueue() { // Size: 124 // EAX: pActor // EDX: pIndex -int AddToLollipopQueue(br_actor *pActor, int pIndex) { +int AddToLollipopQueue(br_actor* pActor, int pIndex) { } // Offset: 256 // Size: 237 void RenderLollipops() { int must_relink; - br_actor **the_actor; - br_actor *old_parent; + br_actor** the_actor; + br_actor* old_parent; } // Offset: 496 @@ -123,8 +125,8 @@ void RenderLollipops() { // EDX: pX1 // EBX: pY1 // ECX: pX2 -void DRDrawLine(br_pixelmap *pDestn, int pX1, int pY1, int pX2, int pY2, int pColour) { - tU8 *d_ptr; +void DRDrawLine(br_pixelmap* pDestn, int pX1, int pY1, int pX2, int pY2, int pColour) { + tU8* d_ptr; tS32 y_delta; tS32 x_delta; tU32 current_y; @@ -141,7 +143,7 @@ void DRDrawLine(br_pixelmap *pDestn, int pX1, int pY1, int pX2, int pY2, int pCo // EDX: pX // EBX: pY // ECX: pY_pitch -void DrawDigitAt(br_pixelmap *gImage, int pX, int pY, int pY_pitch, int pValue) { +void DrawDigitAt(br_pixelmap* gImage, int pX, int pY, int pY_pitch, int pValue) { } // Offset: 696 @@ -150,7 +152,7 @@ void DrawDigitAt(br_pixelmap *gImage, int pX, int pY, int pY_pitch, int pValue) // EDX: pX // EBX: pY // ECX: pX_pitch -void DrawNumberAt(br_pixelmap *gImage, int pX, int pY, int pX_pitch, int pY_pitch, int pValue, int pDigit_count, int pLeading_zeroes) { +void DrawNumberAt(br_pixelmap* gImage, int pX, int pY, int pX_pitch, int pY_pitch, int pValue, int pDigit_count, int pLeading_zeroes) { int i; int the_value; } @@ -158,7 +160,7 @@ void DrawNumberAt(br_pixelmap *gImage, int pX, int pY, int pX_pitch, int pY_pitc // Offset: 852 // Size: 350 // EAX: pPalette -void BuildColourTable(br_pixelmap *pPalette) { +void BuildColourTable(br_pixelmap* pPalette) { int i; int j; int nearest_index; @@ -178,7 +180,7 @@ void ClearConcussion() { // Size: 137 // EAX: pSource // EDX: pCount -tS8* SkipLines(tS8 *pSource, int pCount) { +tS8* SkipLines(tS8* pSource, int pCount) { int i; int j; int number_of_chunks; @@ -190,9 +192,9 @@ tS8* SkipLines(tS8 *pSource, int pCount) { // EAX: pDst // EDX: pSrc // EBX: pN -void CopyWords(char *pDst, char *pSrc, int pN) { - tU16 *dst; - tU16 *src; +void CopyWords(char* pDst, char* pSrc, int pN) { + tU16* dst; + tU16* src; } // Offset: 1516 @@ -201,7 +203,7 @@ void CopyWords(char *pDst, char *pSrc, int pN) { // EDX: pDest_x // EBX: pOffset_x // ECX: pDest_y -void Copy8BitStripImageTo16Bit(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pOffset_x, br_int_16 pDest_y, br_int_16 pOffset_y, tS8 *pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_uint_16 pWidth, br_uint_16 pHeight) { +void Copy8BitStripImageTo16Bit(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pOffset_x, br_int_16 pDest_y, br_int_16 pOffset_y, tS8* pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_uint_16 pWidth, br_uint_16 pHeight) { int i; int j; int height; @@ -211,8 +213,8 @@ void Copy8BitStripImageTo16Bit(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 int off_the_left; int destn_width; int chunk_length; - char *destn_ptr; - char *destn_ptr2; + char* destn_ptr; + char* destn_ptr2; } // Offset: 2124 @@ -221,7 +223,7 @@ void Copy8BitStripImageTo16Bit(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 // EDX: pDest_x // EBX: pOffset_x // ECX: pDest_y -void CopyStripImage(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pOffset_x, br_int_16 pDest_y, br_int_16 pOffset_y, tS8 *pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_uint_16 pWidth, br_uint_16 pHeight) { +void CopyStripImage(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pOffset_x, br_int_16 pDest_y, br_int_16 pOffset_y, tS8* pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_uint_16 pWidth, br_uint_16 pHeight) { int i; int j; int height; @@ -231,8 +233,8 @@ void CopyStripImage(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pOffset_x, int off_the_left; int destn_width; int chunk_length; - char *destn_ptr; - char *destn_ptr2; + char* destn_ptr; + char* destn_ptr2; } // Offset: 2776 @@ -269,27 +271,27 @@ void ScreenLarger() { // EAX: pPalette // EDX: pFirst_colour // EBX: pCount -void DRSetPaletteEntries(br_pixelmap *pPalette, int pFirst_colour, int pCount) { +void DRSetPaletteEntries(br_pixelmap* pPalette, int pFirst_colour, int pCount) { } // Offset: 4144 // Size: 128 // EAX: pThe_palette // EDX: pSet_current_palette -void DRSetPalette3(br_pixelmap *pThe_palette, int pSet_current_palette) { +void DRSetPalette3(br_pixelmap* pThe_palette, int pSet_current_palette) { } // Offset: 4272 // Size: 140 // EAX: pThe_palette // EDX: pSet_current_palette -void DRSetPalette2(br_pixelmap *pThe_palette, int pSet_current_palette) { +void DRSetPalette2(br_pixelmap* pThe_palette, int pSet_current_palette) { } // Offset: 4412 // Size: 50 // EAX: pThe_palette -void DRSetPalette(br_pixelmap *pThe_palette) { +void DRSetPalette(br_pixelmap* pThe_palette) { } // Offset: 4464 @@ -301,8 +303,8 @@ void InitializePalettes() { // Offset: 4880 // Size: 66 // EAX: pPal_name -void SwitchToPalette(char *pPal_name) { - br_pixelmap *the_palette; +void SwitchToPalette(char* pPal_name) { + br_pixelmap* the_palette; } // Offset: 4948 @@ -318,6 +320,15 @@ void ClearWobbles() { // Offset: 5128 // Size: 108 void InitWobbleStuff() { + int i; + + for (i = 0; i < 5; i++) { + gWobble_array[i].amplitude_x = 0; + } + + for (i = 0; i < 64; i++) { + gCosine_array[i] = cosf((double)i * 0.015625f * 3.141592653589793f * 0.5f); + } } // Offset: 5236 @@ -377,7 +388,7 @@ void SufferFromConcussion(float pSeriousness) { // EDX: pDepth_buffer // EBX: pCamera // ECX: pCamera_to_world -void ProcessNonTrackActors(br_pixelmap *pRender_buffer, br_pixelmap *pDepth_buffer, br_actor *pCamera, br_matrix34 *pCamera_to_world, br_matrix34 *pOld_camera_matrix) { +void ProcessNonTrackActors(br_pixelmap* pRender_buffer, br_pixelmap* pDepth_buffer, br_actor* pCamera, br_matrix34* pCamera_to_world, br_matrix34* pOld_camera_matrix) { } // Offset: 7188 @@ -393,10 +404,10 @@ int OppositeColour(int pColour) { // EDX: pTime // EBX: pTrans // ECX: pPos -void DrawMapBlip(tCar_spec *pCar, tU32 pTime, br_matrix34 *pTrans, br_vector3 *pPos, int pColour) { +void DrawMapBlip(tCar_spec* pCar, tU32 pTime, br_matrix34* pTrans, br_vector3* pPos, int pColour) { br_vector3 map_pos; int offset; - int *arrow_ptr; + int* arrow_ptr; int point_count; int colours[2]; int x; @@ -423,7 +434,7 @@ void DrawMapBlip(tCar_spec *pCar, tU32 pTime, br_matrix34 *pTrans, br_vector3 *p // EAX: pTime // EDX: pPos // EBX: pColour -void DrawMapSmallBlip(tU32 pTime, br_vector3 *pPos, int pColour) { +void DrawMapSmallBlip(tU32 pTime, br_vector3* pPos, int pColour) { br_vector3 map_pos; int offset; tU32 time_diff; @@ -435,13 +446,13 @@ void DrawMapSmallBlip(tU32 pTime, br_vector3 *pPos, int pColour) { // EDX: pCar // EBX: p1 // ECX: p2 -void MungeClipPlane(br_vector3 *pLight, tCar_spec *pCar, br_vector3 *p1, br_vector3 *p2, br_scalar pY_offset) { +void MungeClipPlane(br_vector3* pLight, tCar_spec* pCar, br_vector3* p1, br_vector3* p2, br_scalar pY_offset) { br_vector3 v1; br_vector3 v2; br_vector3 v3; br_vector3 v4; br_scalar length; - br_actor *new_clip; + br_actor* new_clip; } // Offset: 10024 @@ -449,7 +460,7 @@ void MungeClipPlane(br_vector3 *pLight, tCar_spec *pCar, br_vector3 *p1, br_vect // EAX: pCar // EDX: pLight // EBX: pIndex_1 -void TryThisEdge(tCar_spec *pCar, br_vector3 *pLight, int pIndex_1, br_scalar pSign_1, int pIndex_2, br_scalar pSign_2, int pPoint_index_1, int pPoint_index_2, br_scalar pY_offset) { +void TryThisEdge(tCar_spec* pCar, br_vector3* pLight, int pIndex_1, br_scalar pSign_1, int pIndex_2, br_scalar pSign_2, int pPoint_index_1, int pPoint_index_2, br_scalar pY_offset) { br_scalar dot_1; br_scalar dot_2; br_scalar mult; @@ -458,7 +469,7 @@ void TryThisEdge(tCar_spec *pCar, br_vector3 *pLight, int pIndex_1, br_scalar pS // Offset: 10204 // Size: 104 // EAX: pPos -br_scalar DistanceFromPlane(br_vector3 *pPos, br_scalar pA, br_scalar pB, br_scalar pC, br_scalar pD) { +br_scalar DistanceFromPlane(br_vector3* pPos, br_scalar pA, br_scalar pB, br_scalar pC, br_scalar pD) { br_vector3 normal; } @@ -478,7 +489,7 @@ void EnableLights() { // EDX: pWorld // EBX: pTrack_spec // ECX: pCamera -void ProcessShadow(tCar_spec *pCar, br_actor *pWorld, tTrack_spec *pTrack_spec, br_actor *pCamera, br_matrix34 *pCamera_to_world_transform, br_scalar pDistance_factor) { +void ProcessShadow(tCar_spec* pCar, br_actor* pWorld, tTrack_spec* pTrack_spec, br_actor* pCamera, br_matrix34* pCamera_to_world_transform, br_scalar pDistance_factor) { int i; int j; int face_count; @@ -498,10 +509,10 @@ void ProcessShadow(tCar_spec *pCar, br_actor *pWorld, tTrack_spec *pTrack_spec, br_vector3 normal; br_vector3 the_normal; br_vector3 pos_cam_space; - br_vector3 *v0; - br_vector3 *v1; - br_vector3 *v2; - br_vector4 *clip_normal; + br_vector3* v0; + br_vector3* v1; + br_vector3* v2; + br_vector4* clip_normal; br_scalar bounds_x_min; br_scalar bounds_x_max; br_scalar bounds_y_min; @@ -522,13 +533,13 @@ void ProcessShadow(tCar_spec *pCar, br_actor *pWorld, tTrack_spec *pTrack_spec, br_scalar ray_length; tBounds kev_bounds; tFace_ref the_list[100]; - tFace_ref *face_ref; - tFace_ref *list_ptr; - br_renderbounds_cbfn *old_call_back; - br_camera *camera_ptr; - br_actor *oily_actor; - br_model *model; - br_material *material; + tFace_ref* face_ref; + tFace_ref* list_ptr; + br_renderbounds_cbfn* old_call_back; + br_camera* camera_ptr; + br_actor* oily_actor; + br_model* model; + br_material* material; br_vertex verts[48]; br_face faces[16]; } @@ -539,11 +550,11 @@ void ProcessShadow(tCar_spec *pCar, br_actor *pWorld, tTrack_spec *pTrack_spec, // EDX: pTrack_spec // EBX: pCamera // ECX: pCamera_to_world_transform -void RenderShadows(br_actor *pWorld, tTrack_spec *pTrack_spec, br_actor *pCamera, br_matrix34 *pCamera_to_world_transform) { +void RenderShadows(br_actor* pWorld, tTrack_spec* pTrack_spec, br_actor* pCamera, br_matrix34* pCamera_to_world_transform) { int i; int cat; int car_count; - tCar_spec *the_car; + tCar_spec* the_car; br_vector3 camera_to_car; br_scalar distance_factor; } @@ -553,7 +564,7 @@ void RenderShadows(br_actor *pWorld, tTrack_spec *pTrack_spec, br_actor *pCamera // EAX: pIndex // EDX: pTime void FlashyMapCheckpoint(int pIndex, tU32 pTime) { - tCheckpoint *cp; + tCheckpoint* cp; static tU32 last_flash; static int flash_state; } @@ -561,7 +572,7 @@ void FlashyMapCheckpoint(int pIndex, tU32 pTime) { // Offset: 15908 // Size: 252 // EAX: pPixelmap -int ConditionallyFillWithSky(br_pixelmap *pPixelmap) { +int ConditionallyFillWithSky(br_pixelmap* pPixelmap) { int bgnd_col; } @@ -583,14 +594,14 @@ void RenderAFrame(int pDepth_mask_on) { int map_timer_x; int map_timer_width; int ped_type; - char *old_pixels; + char* old_pixels; br_matrix34 old_camera_matrix; br_matrix34 old_mirror_cam_matrix; tU32 the_time; - br_vector3 *car_pos; + br_vector3* car_pos; br_vector3 pos; char the_text[256]; - tCar_spec *car; + tCar_spec* car; } // Offset: 19912 @@ -606,7 +617,7 @@ void RevertPalette() { // Offset: 20044 // Size: 34 void MungePalette() { - tU8 *q; + tU8* q; int i; float damage; float throb_start; @@ -631,7 +642,7 @@ void ResetPalette() { // Size: 65 // EAX: pPtr // EDX: pDarken_amount -void Darken(tU8 *pPtr, unsigned int pDarken_amount) { +void Darken(tU8* pPtr, unsigned int pDarken_amount) { unsigned int value; } @@ -640,8 +651,8 @@ void Darken(tU8 *pPtr, unsigned int pDarken_amount) { // EAX: pDegree void SetFadedPalette(int pDegree) { int j; - br_pixelmap *the_palette; - char *the_pixels; + br_pixelmap* the_palette; + char* the_pixels; } // Offset: 20396 @@ -671,8 +682,8 @@ void EnsureRenderPalette() { // Offset: 20812 // Size: 248 // EAX: pPixmap_name -void SplashScreenWith(char *pPixmap_name) { - br_pixelmap *the_map; +void SplashScreenWith(char* pPixmap_name) { + br_pixelmap* the_map; } // Offset: 21060 @@ -682,7 +693,7 @@ void EnsurePaletteUp() { // Offset: 21108 // Size: 103 -br_uint_32 AmbientificateMaterial(br_material *pMat, void *pArg) { +br_uint_32 AmbientificateMaterial(br_material* pMat, void* pArg) { float a; } @@ -702,16 +713,16 @@ void InitAmbience() { // EDX: pDest_x // EBX: pDest_y // ECX: pSource -void DRPixelmapRectangleMaskedCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap *pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight) { +void DRPixelmapRectangleMaskedCopy(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap* pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight) { int y_count; int x_count; int dest_row_wrap; int source_row_wrap; int x_delta; tU8 the_byte; - tU8 *source_ptr; - tU8 *dest_ptr; - tU8 *conv_table; + tU8* source_ptr; + tU8* dest_ptr; + tU8* conv_table; } // Offset: 22120 @@ -719,7 +730,7 @@ void DRPixelmapRectangleMaskedCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_int // EAX: pDest_x // EDX: pDest_y // EBX: pSource -void DRMaskedStamp(br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap *pSource) { +void DRMaskedStamp(br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap* pSource) { } // Offset: 22208 @@ -728,16 +739,16 @@ void DRMaskedStamp(br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap *pSource) { // EDX: pDest_x // EBX: pDest_y // ECX: pSource -void DRPixelmapRectangleOnscreenCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap *pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight) { +void DRPixelmapRectangleOnscreenCopy(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap* pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight) { int y_count; int x_count; int dest_row_wrap; int source_row_wrap; int x_delta; tU8 the_byte; - tU8 *source_ptr; - tU8 *dest_ptr; - tU8 *conv_table; + tU8* source_ptr; + tU8* dest_ptr; + tU8* conv_table; } // Offset: 22540 @@ -746,7 +757,7 @@ void DRPixelmapRectangleOnscreenCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_i // EDX: pDest_x // EBX: pDest_y // ECX: pSource -void DRPixelmapRectangleShearedCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap *pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight, tX1616 pShear) { +void DRPixelmapRectangleShearedCopy(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap* pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight, tX1616 pShear) { int y_count; int x_count; int dest_row_wrap; @@ -756,9 +767,9 @@ void DRPixelmapRectangleShearedCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_in int current_shear_x; int shear_x_difference; tU8 the_byte; - tU8 *source_ptr; - tU8 *dest_ptr; - tU8 *conv_table; + tU8* source_ptr; + tU8* dest_ptr; + tU8* conv_table; tX1616 current_shear; } @@ -768,15 +779,15 @@ void DRPixelmapRectangleShearedCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_in // EDX: pDest_x // EBX: pDest_y // ECX: pSource -void DRPixelmapRectangleVScaledCopy(br_pixelmap *pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap *pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight) { +void DRPixelmapRectangleVScaledCopy(br_pixelmap* pDest, br_int_16 pDest_x, br_int_16 pDest_y, br_pixelmap* pSource, br_int_16 pSource_x, br_int_16 pSource_y, br_int_16 pWidth, br_int_16 pHeight) { int y_count; int x_count; int dest_row_wrap; int source_row_wrap; int x_delta; tU8 the_byte; - tU8 *source_ptr; - tU8 *dest_ptr; + tU8* source_ptr; + tU8* dest_ptr; tU32 source_y; tU32 source_y_delta; tU32 old_source_y; @@ -826,8 +837,8 @@ void SaveTransient(int pIndex, int pX_coord, int pY_coord) { // Offset: 24592 // Size: 214 // EAX: pGib -void DrawCursorGiblet(tCursor_giblet *pGib) { - br_pixelmap *the_image; +void DrawCursorGiblet(tCursor_giblet* pGib) { + br_pixelmap* the_image; } // Offset: 24808 @@ -837,7 +848,7 @@ void ProcessCursorGiblets(int pPeriod) { int i; int kill_the_giblet; tU32 time_now; - tCursor_giblet *gib; + tCursor_giblet* gib; } // Offset: 25552 @@ -897,7 +908,7 @@ void LoadFont(int pFont_ID) { tPath_name the_path; int i; int number_of_chars; - FILE *f; + FILE* f; tU32 the_size; } @@ -918,7 +929,7 @@ void InitDRFonts() { // EDX: pLeft // EBX: pTop // ECX: pTop_clip -void DrawDropImage(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip, int pOffset) { +void DrawDropImage(br_pixelmap* pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip, int pOffset) { int y; int src_y; int src_height; @@ -931,7 +942,7 @@ void DrawDropImage(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, int // EDX: pLeft // EBX: pTop // ECX: pTop_clip -void DropInImageFromTop(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { +void DropInImageFromTop(br_pixelmap* pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { tS32 start_time; tS32 the_time; int drop_distance; @@ -943,7 +954,7 @@ void DropInImageFromTop(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, // EDX: pLeft // EBX: pTop // ECX: pTop_clip -void DropOutImageThruBottom(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { +void DropOutImageThruBottom(br_pixelmap* pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { tS32 start_time; tS32 the_time; int drop_distance; @@ -955,7 +966,7 @@ void DropOutImageThruBottom(br_pixelmap *pImage, int pLeft, int pTop, int pTop_c // EDX: pLeft // EBX: pTop // ECX: pTop_clip -void DropInImageFromBottom(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { +void DropInImageFromBottom(br_pixelmap* pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { tS32 start_time; tS32 the_time; int drop_distance; @@ -967,7 +978,7 @@ void DropInImageFromBottom(br_pixelmap *pImage, int pLeft, int pTop, int pTop_cl // EDX: pLeft // EBX: pTop // ECX: pTop_clip -void DropOutImageThruTop(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { +void DropOutImageThruTop(br_pixelmap* pImage, int pLeft, int pTop, int pTop_clip, int pBottom_clip) { tS32 start_time; tS32 the_time; int drop_distance; @@ -979,7 +990,7 @@ void DropOutImageThruTop(br_pixelmap *pImage, int pLeft, int pTop, int pTop_clip // EDX: pLeft // EBX: pTop // ECX: pPercentage -void DrawTellyLine(br_pixelmap *pImage, int pLeft, int pTop, int pPercentage) { +void DrawTellyLine(br_pixelmap* pImage, int pLeft, int pTop, int pPercentage) { int the_width; int the_height; } @@ -990,7 +1001,7 @@ void DrawTellyLine(br_pixelmap *pImage, int pLeft, int pTop, int pPercentage) { // EDX: pLeft // EBX: pTop // ECX: pPercentage -void DrawTellyImage(br_pixelmap *pImage, int pLeft, int pTop, int pPercentage) { +void DrawTellyImage(br_pixelmap* pImage, int pLeft, int pTop, int pPercentage) { int the_height; } @@ -999,7 +1010,7 @@ void DrawTellyImage(br_pixelmap *pImage, int pLeft, int pTop, int pPercentage) { // EAX: pImage // EDX: pLeft // EBX: pTop -void TellyInImage(br_pixelmap *pImage, int pLeft, int pTop) { +void TellyInImage(br_pixelmap* pImage, int pLeft, int pTop) { tS32 start_time; tS32 the_time; } @@ -1009,7 +1020,7 @@ void TellyInImage(br_pixelmap *pImage, int pLeft, int pTop) { // EAX: pImage // EDX: pLeft // EBX: pTop -void TellyOutImage(br_pixelmap *pImage, int pLeft, int pTop) { +void TellyOutImage(br_pixelmap* pImage, int pLeft, int pTop) { tS32 start_time; tS32 the_time; int drop_distance; @@ -1040,7 +1051,7 @@ void InitShadow() { // Offset: 31320 // Size: 140 -br_uint_32 SaveShadeTable(br_pixelmap *pTable, void *pArg) { +br_uint_32 SaveShadeTable(br_pixelmap* pTable, void* pArg) { } // Offset: 31460 @@ -1074,11 +1085,11 @@ int SwitchToLoresMode() { // EDX: pSource // EBX: pSource_width // ECX: pSource_height -void DRPixelmapDoubledCopy(br_pixelmap *pDestn, br_pixelmap *pSource, int pSource_width, int pSource_height, int pX_offset, int pY_offset) { - tU16 *sptr; +void DRPixelmapDoubledCopy(br_pixelmap* pDestn, br_pixelmap* pSource, int pSource_width, int pSource_height, int pX_offset, int pY_offset) { + tU16* sptr; tU16 pixels; - tU8 *dptr; - tU8 *dptr2; + tU8* dptr; + tU8* dptr2; tU8 pixel_1; tU8 pixel_2; int i; @@ -1087,4 +1098,3 @@ void DRPixelmapDoubledCopy(br_pixelmap *pDestn, br_pixelmap *pSource, int pSourc int src_row_skip; int width_over_2; } - diff --git a/src/DETHRACE/common/loading.c b/src/DETHRACE/common/loading.c index 4b3a1f85..b5a97ad1 100644 --- a/src/DETHRACE/common/loading.c +++ b/src/DETHRACE/common/loading.c @@ -5,19 +5,19 @@ #include "globvars.h" #include "utility.h" -char *gWheel_actor_names[6]; +char* gWheel_actor_names[6]; int gFunk_groove_flags[30]; -char *gNet_avail_names[4]; -char *gDamage_names[12]; -char *gDrivable_car_names[6]; -char *gYour_car_names[2][6]; +char* gNet_avail_names[4]; +char* gDamage_names[12]; +char* gDrivable_car_names[6]; +char* gYour_car_names[2][6]; char gDef_def_water_screen_name[32]; tHeadup_info gHeadup_image_info[31]; int gAllow_open_to_fail; -br_material *gDestn_screen_mat; -br_material *gSource_screen_mat; -char *gRaces_file_names[9]; -char *gFloorpan_names[5]; +br_material* gDestn_screen_mat; +br_material* gSource_screen_mat; +char* gRaces_file_names[9]; +char* gFloorpan_names[5]; int gCurrent_race_file_index; int gGroove_funk_offset; int gDemo_armour; @@ -26,47 +26,47 @@ int gDecode_thing = '@'; int gDemo_opponents[5]; int gDemo_power; int gDemo_offensive; -char gDecode_string[14]; +char gDecode_string[14] = { 0x9B, 0x52, 0x93, 0x9F, 0x52, 0x98, 0x9B, 0x96, 0x96, 0x9E, 0x9B, 0xA0, 0x99, 0x0 }; // Offset: 0 // Size: 67 // EAX: pF -tU32 ReadU32(FILE *pF) { +tU32 ReadU32(FILE* pF) { tU32 raw_long; } // Offset: 68 // Size: 67 // EAX: pF -tU16 ReadU16(FILE *pF) { +tU16 ReadU16(FILE* pF) { tU16 raw_short; } // Offset: 136 // Size: 67 // EAX: pF -tU8 ReadU8(FILE *pF) { +tU8 ReadU8(FILE* pF) { tU8 raw_byte; } // Offset: 204 // Size: 67 // EAX: pF -tS32 ReadS32(FILE *pF) { +tS32 ReadS32(FILE* pF) { tS32 raw_long; } // Offset: 272 // Size: 67 // EAX: pF -tS16 ReadS16(FILE *pF) { +tS16 ReadS16(FILE* pF) { tS16 raw_short; } // Offset: 340 // Size: 67 // EAX: pF -tS8 ReadS8(FILE *pF) { +tS8 ReadS8(FILE* pF) { tS8 raw_byte; } @@ -74,7 +74,7 @@ tS8 ReadS8(FILE *pF) { // Size: 65 // EAX: pF // EDX: pNumber -void WriteU32L(FILE *pF, tU32 pNumber) { +void WriteU32L(FILE* pF, tU32 pNumber) { tU32 raw_long; } @@ -82,7 +82,7 @@ void WriteU32L(FILE *pF, tU32 pNumber) { // Size: 65 // EAX: pF // EDX: pNumber -void WriteU16L(FILE *pF, tU16 pNumber) { +void WriteU16L(FILE* pF, tU16 pNumber) { tU16 raw_short; } @@ -90,7 +90,7 @@ void WriteU16L(FILE *pF, tU16 pNumber) { // Size: 65 // EAX: pF // EDX: pNumber -void WriteU8L(FILE *pF, tU8 pNumber) { +void WriteU8L(FILE* pF, tU8 pNumber) { tU8 raw_byte; } @@ -98,7 +98,7 @@ void WriteU8L(FILE *pF, tU8 pNumber) { // Size: 65 // EAX: pF // EDX: pNumber -void WriteS32L(FILE *pF, tS32 pNumber) { +void WriteS32L(FILE* pF, tS32 pNumber) { tS32 raw_long; } @@ -106,7 +106,7 @@ void WriteS32L(FILE *pF, tS32 pNumber) { // Size: 65 // EAX: pF // EDX: pNumber -void WriteS16L(FILE *pF, tS16 pNumber) { +void WriteS16L(FILE* pF, tS16 pNumber) { tS16 raw_short; } @@ -114,7 +114,7 @@ void WriteS16L(FILE *pF, tS16 pNumber) { // Size: 65 // EAX: pF // EDX: pNumber -void WriteS8L(FILE *pF, tS8 pNumber) { +void WriteS8L(FILE* pF, tS8 pNumber) { tS8 raw_byte; } @@ -122,47 +122,47 @@ void WriteS8L(FILE *pF, tS8 pNumber) { // Size: 54 // EAX: pF // EDX: pBytes_to_skip -void SkipBytes(FILE *pF, int pBytes_to_skip) { +void SkipBytes(FILE* pF, int pBytes_to_skip) { } // Offset: 872 // Size: 70 // EAX: pPtr -tU32 MemReadU32(char **pPtr) { +tU32 MemReadU32(char** pPtr) { tU32 raw_long; } // Offset: 944 // Size: 70 // EAX: pPtr -tU16 MemReadU16(char **pPtr) { +tU16 MemReadU16(char** pPtr) { tU16 raw_short; } // Offset: 1016 // Size: 55 // EAX: pPtr -tU8 MemReadU8(char **pPtr) { +tU8 MemReadU8(char** pPtr) { } // Offset: 1072 // Size: 70 // EAX: pPtr -tS32 MemReadS32(char **pPtr) { +tS32 MemReadS32(char** pPtr) { tS32 raw_long; } // Offset: 1144 // Size: 70 // EAX: pPtr -tS16 MemReadS16(char **pPtr) { +tS16 MemReadS16(char** pPtr) { tS16 raw_short; } // Offset: 1216 // Size: 55 // EAX: pPtr -tS8 MemReadS8(char **pPtr) { +tS8 MemReadS8(char** pPtr) { tS8 raw_byte; } @@ -170,17 +170,18 @@ tS8 MemReadS8(char **pPtr) { // Size: 46 // EAX: pPtr // EDX: pBytes_to_skip -void MemSkipBytes(char **pPtr, int pBytes_to_skip) { +void MemSkipBytes(char** pPtr, int pBytes_to_skip) { } // Offset: 1320 // Size: 2149 void LoadGeneralParameters() { + FILE* f; tPath_name the_path; int i; int temp; char s[256]; - char *str; + char* str; } // Offset: 3472 @@ -191,10 +192,10 @@ void FinishLoadingGeneral() { // Offset: 3528 // Size: 292 // EAX: pName -br_pixelmap* LoadPixelmap(char *pName) { +br_pixelmap* LoadPixelmap(char* pName) { tPath_name the_path; - br_pixelmap *pm; - char *end; + br_pixelmap* pm; + char* end; } // Offset: 3820 @@ -202,7 +203,7 @@ br_pixelmap* LoadPixelmap(char *pName) { // EAX: pFile_name // EDX: pPixelmaps // EBX: pNum -br_uint_32 LoadPixelmaps(char *pFile_name, br_pixelmap **pPixelmaps, br_uint_16 pNum) { +br_uint_32 LoadPixelmaps(char* pFile_name, br_pixelmap** pPixelmaps, br_uint_16 pNum) { tPath_name path; int count; } @@ -210,46 +211,46 @@ br_uint_32 LoadPixelmaps(char *pFile_name, br_pixelmap **pPixelmaps, br_uint_16 // Offset: 4044 // Size: 99 // EAX: pName -br_pixelmap* LoadShadeTable(char *pName) { +br_pixelmap* LoadShadeTable(char* pName) { tPath_name the_path; } // Offset: 4144 // Size: 129 // EAX: pName -br_material* LoadMaterial(char *pName) { +br_material* LoadMaterial(char* pName) { tPath_name the_path; - br_material *result; + br_material* result; } // Offset: 4276 // Size: 123 // EAX: pName -br_model* LoadModel(char *pName) { +br_model* LoadModel(char* pName) { tPath_name the_path; - br_model *model; + br_model* model; } // Offset: 4400 // Size: 104 // EAX: pName -br_actor* LoadActor(char *pName) { +br_actor* LoadActor(char* pName) { tPath_name the_path; } // Offset: 4504 // Size: 78 // EAX: pPath_name -void DRLoadPalette(char *pPath_name) { - br_pixelmap *palette_array[100]; +void DRLoadPalette(char* pPath_name) { + br_pixelmap* palette_array[100]; int number_of_palettes; } // Offset: 4584 // Size: 78 // EAX: pPath_name -void DRLoadShadeTable(char *pPath_name) { - br_pixelmap *table_array[100]; +void DRLoadShadeTable(char* pPath_name) { + br_pixelmap* table_array[100]; int number_of_tables; } @@ -257,38 +258,38 @@ void DRLoadShadeTable(char *pPath_name) { // Size: 84 // EAX: pPixelmap_array // EDX: pCount -void RezeroPixelmaps(br_pixelmap **pPixelmap_array, int pCount) { +void RezeroPixelmaps(br_pixelmap** pPixelmap_array, int pCount) { } // Offset: 4748 // Size: 97 // EAX: pPath_name -void DRLoadPixelmaps(char *pPath_name) { - br_pixelmap *pixelmap_array[100]; +void DRLoadPixelmaps(char* pPath_name) { + br_pixelmap* pixelmap_array[100]; int number_of_pixelmaps; } // Offset: 4848 // Size: 103 // EAX: pPath_name -void DRLoadMaterials(char *pPath_name) { - br_material *material_array[100]; +void DRLoadMaterials(char* pPath_name) { + br_material* material_array[100]; int number_of_materials; } // Offset: 4952 // Size: 103 // EAX: pPath_name -void DRLoadModels(char *pPath_name) { - br_model *model_array[100]; +void DRLoadModels(char* pPath_name) { + br_model* model_array[100]; int number_of_models; } // Offset: 5056 // Size: 134 // EAX: pPath_name -void DRLoadActors(char *pPath_name) { - br_actor *actor_array[100]; +void DRLoadActors(char* pPath_name) { + br_actor* actor_array[100]; int number_of_actors; int i; } @@ -296,8 +297,8 @@ void DRLoadActors(char *pPath_name) { // Offset: 5192 // Size: 134 // EAX: pPath_name -void DRLoadLights(char *pPath_name) { - br_actor *light_array[100]; +void DRLoadLights(char* pPath_name) { + br_actor* light_array[100]; int number_of_lights; int i; } @@ -307,14 +308,14 @@ void DRLoadLights(char *pPath_name) { // EAX: pThe_base_path // EDX: pThe_dir_name // EBX: pLoad_routine -void LoadInFiles(char *pThe_base_path, char *pThe_dir_name, void (*pLoad_routine)(char*)) { +void LoadInFiles(char* pThe_base_path, char* pThe_dir_name, void (*pLoad_routine)(char*)) { tPath_name the_path; } // Offset: 5400 // Size: 208 // EAX: pThe_dir_path -void LoadInRegisteeDir(char *pThe_dir_path) { +void LoadInRegisteeDir(char* pThe_dir_path) { tPath_name the_path; } @@ -351,7 +352,7 @@ void InitInterfaceLoadState() { // Offset: 6456 // Size: 627 // EAX: pBr_map -tS8* ConvertPixTo16BitStripMap(br_pixelmap *pBr_map) { +tS8* ConvertPixTo16BitStripMap(br_pixelmap* pBr_map) { int i; int j; int new_line_length; @@ -360,19 +361,19 @@ tS8* ConvertPixTo16BitStripMap(br_pixelmap *pBr_map) { int counter; int chunk_counter; int max_line_bytes; - tU8 *next_byte; - tU8 *strip_image; - tU8 *current_strip_pointer; - tU8 *temp_strip_image; - tU8 *new_line; + tU8* next_byte; + tU8* strip_image; + tU8* current_strip_pointer; + tU8* temp_strip_image; + tU8* new_line; tU8 byte; - tU16 *palette_entry; + tU16* palette_entry; } // Offset: 7084 // Size: 578 // EAX: pThe_br_map -tS8* ConvertPixToStripMap(br_pixelmap *pThe_br_map) { +tS8* ConvertPixToStripMap(br_pixelmap* pThe_br_map) { int i; int j; int new_line_length; @@ -380,10 +381,10 @@ tS8* ConvertPixToStripMap(br_pixelmap *pThe_br_map) { int counting_blanks; int counter; int chunk_counter; - tU8 *next_byte; - tU8 *the_strip_image; - tU8 *current_strip_pointer; - tU8 *temp_strip_image; + tU8* next_byte; + tU8* the_strip_image; + tU8* current_strip_pointer; + tU8* temp_strip_image; tU8 new_line[800]; tU8 the_byte; } @@ -392,24 +393,24 @@ tS8* ConvertPixToStripMap(br_pixelmap *pThe_br_map) { // Size: 147 // EAX: pModel // EDX: pMaterial -void KillWindscreen(br_model *pModel, br_material *pMaterial) { - br_face *face; +void KillWindscreen(br_model* pModel, br_material* pMaterial) { + br_face* face; int i; } // Offset: 7812 // Size: 103 // EAX: pCar -void DropOffDyingPeds(tCar_spec *pCar) { - br_actor *child; - br_actor *next; +void DropOffDyingPeds(tCar_spec* pCar) { + br_actor* child; + br_actor* next; } // Offset: 7916 // Size: 1113 // EAX: pCar_spec // EDX: pOwner -void DisposeCar(tCar_spec *pCar_spec, int pOwner) { +void DisposeCar(tCar_spec* pCar_spec, int pOwner) { int i; int j; } @@ -417,7 +418,7 @@ void DisposeCar(tCar_spec *pCar_spec, int pOwner) { // Offset: 9032 // Size: 626 // EAX: pCar -void AdjustCarCoordinates(tCar_spec *pCar) { +void AdjustCarCoordinates(tCar_spec* pCar) { int i; } @@ -426,10 +427,10 @@ void AdjustCarCoordinates(tCar_spec *pCar) { // EAX: pF // EDX: pIndex // EBX: pCar_spec -void LoadSpeedo(FILE *pF, int pIndex, tCar_spec *pCar_spec) { +void LoadSpeedo(FILE* pF, int pIndex, tCar_spec* pCar_spec) { tPath_name the_path; char s[256]; - char *str; + char* str; char the_char1; char the_char2; } @@ -439,10 +440,10 @@ void LoadSpeedo(FILE *pF, int pIndex, tCar_spec *pCar_spec) { // EAX: pF // EDX: pIndex // EBX: pCar_spec -void LoadTacho(FILE *pF, int pIndex, tCar_spec *pCar_spec) { +void LoadTacho(FILE* pF, int pIndex, tCar_spec* pCar_spec) { tPath_name the_path; char s[256]; - char *str; + char* str; char the_char1; char the_char2; } @@ -452,9 +453,9 @@ void LoadTacho(FILE *pF, int pIndex, tCar_spec *pCar_spec) { // EAX: pF // EDX: pIndex // EBX: pCar_spec -void LoadHeadups(FILE *pF, int pIndex, tCar_spec *pCar_spec) { +void LoadHeadups(FILE* pF, int pIndex, tCar_spec* pCar_spec) { char s[256]; - char *str; + char* str; int j; int number_of_slots; } @@ -463,12 +464,12 @@ void LoadHeadups(FILE *pF, int pIndex, tCar_spec *pCar_spec) { // Size: 1819 // EAX: pF // EDX: non_car -void ReadNonCarMechanicsData(FILE *pF, tNon_car_spec *non_car) { +void ReadNonCarMechanicsData(FILE* pF, tNon_car_spec* non_car) { int number; int i; int j; char s[256]; - tCollision_info *c; + tCollision_info* c; br_scalar wid; br_scalar het; br_scalar len; @@ -481,7 +482,7 @@ void ReadNonCarMechanicsData(FILE *pF, tNon_car_spec *non_car) { // Size: 3476 // EAX: pF // EDX: c -void ReadMechanicsData(FILE *pF, tCar_spec *c) { +void ReadMechanicsData(FILE* pF, tCar_spec* c) { char s[256]; char version; int i; @@ -494,7 +495,7 @@ void ReadMechanicsData(FILE *pF, tCar_spec *c) { br_scalar wid; br_scalar het; br_scalar len; - br_vector3 *actor_offset; + br_vector3* actor_offset; br_scalar speed; br_scalar force; } @@ -504,16 +505,16 @@ void ReadMechanicsData(FILE *pF, tCar_spec *c) { // EAX: pF // EDX: pIndex // EBX: pCar_spec -void LoadGear(FILE *pF, int pIndex, tCar_spec *pCar_spec) { +void LoadGear(FILE* pF, int pIndex, tCar_spec* pCar_spec) { tPath_name the_path; char s[256]; - char *str; + char* str; } // Offset: 17664 // Size: 56 // EAX: pRef_holder -void AddRefOffset(int *pRef_holder) { +void AddRefOffset(int* pRef_holder) { } // Offset: 17720 @@ -521,20 +522,20 @@ void AddRefOffset(int *pRef_holder) { // EAX: pF // EDX: pCar_spec // EBX: pImpact_location -void GetDamageProgram(FILE *pF, tCar_spec *pCar_spec, tImpact_location pImpact_location) { - tDamage_clause *the_clause; +void GetDamageProgram(FILE* pF, tCar_spec* pCar_spec, tImpact_location pImpact_location) { + tDamage_clause* the_clause; int i; int j; int k; int count; char s[256]; char delim[64]; - char *str; + char* str; } // Offset: 18420 // Size: 178 -br_uint_32 LinkModel(br_actor *pActor, tModel_pool *pModel_pool) { +br_uint_32 LinkModel(br_actor* pActor, tModel_pool* pModel_pool) { int i; } @@ -542,7 +543,7 @@ br_uint_32 LinkModel(br_actor *pActor, tModel_pool *pModel_pool) { // Size: 198 // EAX: pModel_array // EDX: pModel_count -void FreeUpBonnetModels(br_model **pModel_array, int pModel_count) { +void FreeUpBonnetModels(br_model** pModel_array, int pModel_count) { int i; } @@ -551,7 +552,7 @@ void FreeUpBonnetModels(br_model **pModel_array, int pModel_count) { // EAX: pActor // EDX: pModel_array // EBX: pModel_count -void LinkModelsToActor(br_actor *pActor, br_model **pModel_array, int pModel_count) { +void LinkModelsToActor(br_actor* pActor, br_model** pModel_array, int pModel_count) { tModel_pool model_pool; } @@ -559,7 +560,7 @@ void LinkModelsToActor(br_actor *pActor, br_model **pModel_array, int pModel_cou // Size: 132 // EAX: pF // EDX: pCar_spec -void ReadShrapnelMaterials(FILE *pF, tCollision_info *pCar_spec) { +void ReadShrapnelMaterials(FILE* pF, tCollision_info* pCar_spec) { char s[256]; char version; int i; @@ -569,22 +570,22 @@ void ReadShrapnelMaterials(FILE *pF, tCollision_info *pCar_spec) { // Size: 200 // EAX: pOutput_car // EDX: pInput_car -void CloneCar(tCar_spec **pOutput_car, tCar_spec *pInput_car) { +void CloneCar(tCar_spec** pOutput_car, tCar_spec* pInput_car) { int i; } // Offset: 19200 // Size: 65 // EAX: pCar -void DisposeClonedCar(tCar_spec *pCar) { +void DisposeClonedCar(tCar_spec* pCar) { } // Offset: 19268 // Size: 523 // EAX: pModel -int RemoveDoubleSided(br_model *pModel) { - br_face *faces; - br_face *face; +int RemoveDoubleSided(br_model* pModel) { + br_face* faces; + br_face* face; int temp; int num_double_sided_faces; int i; @@ -595,8 +596,8 @@ int RemoveDoubleSided(br_model *pModel) { // Offset: 19792 // Size: 201 // EAX: pModel -void MungeWindscreen(br_model *pModel) { - br_face *face; +void MungeWindscreen(br_model* pModel) { + br_face* face; int i; } @@ -604,7 +605,7 @@ void MungeWindscreen(br_model *pModel) { // Size: 141 // EAX: pModel // EDX: pOwner -void SetModelFlags(br_model *pModel, int pOwner) { +void SetModelFlags(br_model* pModel, int pOwner) { } // Offset: 20140 @@ -613,10 +614,10 @@ void SetModelFlags(br_model *pModel, int pOwner) { // EDX: pDriver // EBX: pCar_spec // ECX: pOwner -void LoadCar(char *pCar_name, tDriver pDriver, tCar_spec *pCar_spec, int pOwner, char *pDriver_name, tBrender_storage *pStorage_space) { - FILE *f; - FILE *g; - FILE *h; +void LoadCar(char* pCar_name, tDriver pDriver, tCar_spec* pCar_spec, int pOwner, char* pDriver_name, tBrender_storage* pStorage_space) { + FILE* f; + FILE* g; + FILE* h; tPath_name the_path; int i; int j; @@ -630,11 +631,11 @@ void LoadCar(char *pCar_name, tDriver pDriver, tCar_spec *pCar_spec, int pOwner, int temp_index; int vertex_array_size; char s[256]; - char *str; - br_pixelmap *the_image; + char* str; + br_pixelmap* the_image; float rate; float temp_float; - br_model *model; + br_model* model; br_vector3 tv; int v; int v_num; @@ -663,7 +664,7 @@ FILE* OpenRaceFile() { // Offset: 28740 // Size: 219 // EAX: pF -void SkipRestOfRace(FILE *pF) { +void SkipRestOfRace(FILE* pF) { int j; int k; int text_chunk_count; @@ -676,15 +677,15 @@ void SkipRestOfRace(FILE *pF) { // EAX: pRace_list // EDX: pCount // EBX: pRace_type_index -void LoadRaces(tRace_list_spec *pRace_list, int *pCount, int pRace_type_index) { - FILE *f; +void LoadRaces(tRace_list_spec* pRace_list, int* pCount, int pRace_type_index) { + FILE* f; int i; int j; int k; int number_of_racers; int last_race; char s[256]; - char *str; + char* str; } // Offset: 29372 @@ -703,22 +704,22 @@ void LoadOpponentMugShot(int pIndex) { // Size: 136 // EAX: pRace_info // EDX: pIndex -void DisposeOpponentGridIcon(tRace_info *pRace_info, int pIndex) { +void DisposeOpponentGridIcon(tRace_info* pRace_info, int pIndex) { } // Offset: 29764 // Size: 155 // EAX: pRace_info // EDX: pIndex -void LoadOpponentGridIcon(tRace_info *pRace_info, int pIndex) { +void LoadOpponentGridIcon(tRace_info* pRace_info, int pIndex) { } // Offset: 29920 // Size: 804 // EAX: pRace_index // EDX: pRace_info -void LoadRaceInfo(int pRace_index, tRace_info *pRace_info) { - FILE *f; +void LoadRaceInfo(int pRace_index, tRace_info* pRace_info) { + FILE* f; int i; int j; int k; @@ -728,32 +729,32 @@ void LoadRaceInfo(int pRace_index, tRace_info *pRace_info) { int old_index; int temp_index; char s[256]; - char *str; + char* str; float temp_float; - tText_chunk *the_chunk; + tText_chunk* the_chunk; } // Offset: 30724 // Size: 351 // EAX: pRace_info -void DisposeRaceInfo(tRace_info *pRace_info) { +void DisposeRaceInfo(tRace_info* pRace_info) { int i; int j; int k; - tText_chunk *the_chunk; + tText_chunk* the_chunk; } // Offset: 31076 // Size: 122 // EAX: pRace_info -void LoadGridIcons(tRace_info *pRace_info) { +void LoadGridIcons(tRace_info* pRace_info) { int i; } // Offset: 31200 // Size: 119 // EAX: pRace_info -void DisposeGridIcons(tRace_info *pRace_info) { +void DisposeGridIcons(tRace_info* pRace_info) { int i; } @@ -765,17 +766,17 @@ void LoadOpponents() { int j; int k; char s[256]; - char *str; - tText_chunk *the_chunk; + char* str; + tText_chunk* the_chunk; } // Offset: 32396 // Size: 647 // EAX: pName -br_font* LoadBRFont(char *pName) { - FILE *f; +br_font* LoadBRFont(char* pName) { + FILE* f; tPath_name the_path; - br_font *the_font; + br_font* the_font; tU32 data_size; int i; } @@ -800,7 +801,7 @@ br_pixelmap* LoadChromeFont() { // Offset: 33532 // Size: 49 // EAX: pThe_font -void DisposeChromeFont(br_pixelmap *pThe_font) { +void DisposeChromeFont(br_pixelmap* pThe_font) { } // Offset: 33584 @@ -808,36 +809,36 @@ void DisposeChromeFont(br_pixelmap *pThe_font) { // EAX: pF // EDX: pString_list // EBX: pCount -int GetALineAndInterpretCommand(FILE *pF, char **pString_list, int pCount) { +int GetALineAndInterpretCommand(FILE* pF, char** pString_list, int pCount) { int i; char s[256]; - char *str; + char* str; } // Offset: 33724 // Size: 101 // EAX: pF -int GetAnInt(FILE *pF) { +int GetAnInt(FILE* pF) { char s[256]; - char *str; + char* str; int result; } // Offset: 33828 // Size: 101 // EAX: pF -float GetAFloat(FILE *pF) { +float GetAFloat(FILE* pF) { char s[256]; - char *str; + char* str; float result; } // Offset: 33932 // Size: 107 // EAX: pF -float GetAFloatPercent(FILE *pF) { +float GetAFloatPercent(FILE* pF) { char s[256]; - char *str; + char* str; float result; } @@ -846,9 +847,9 @@ float GetAFloatPercent(FILE *pF) { // EAX: pF // EDX: pF1 // EBX: pF2 -void GetPairOfFloats(FILE *pF, float *pF1, float *pF2) { +void GetPairOfFloats(FILE* pF, float* pF1, float* pF2) { char s[256]; - char *str; + char* str; } // Offset: 34172 @@ -857,9 +858,9 @@ void GetPairOfFloats(FILE *pF, float *pF1, float *pF2) { // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetThreeFloats(FILE *pF, float *pF1, float *pF2, float *pF3) { +void GetThreeFloats(FILE* pF, float* pF1, float* pF2, float* pF3) { char s[256]; - char *str; + char* str; } // Offset: 34344 @@ -867,9 +868,9 @@ void GetThreeFloats(FILE *pF, float *pF1, float *pF2, float *pF3) { // EAX: pF // EDX: pF1 // EBX: pF2 -void GetPairOfInts(FILE *pF, int *pF1, int *pF2) { +void GetPairOfInts(FILE* pF, int* pF1, int* pF2) { char s[256]; - char *str; + char* str; } // Offset: 34476 @@ -878,9 +879,9 @@ void GetPairOfInts(FILE *pF, int *pF1, int *pF2) { // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetThreeInts(FILE *pF, int *pF1, int *pF2, int *pF3) { +void GetThreeInts(FILE* pF, int* pF1, int* pF2, int* pF3) { char s[256]; - char *str; + char* str; } // Offset: 34648 @@ -889,9 +890,9 @@ void GetThreeInts(FILE *pF, int *pF1, int *pF2, int *pF3) { // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetThreeIntsAndAString(FILE *pF, int *pF1, int *pF2, int *pF3, char *pS) { +void GetThreeIntsAndAString(FILE* pF, int* pF1, int* pF2, int* pF3, char* pS) { char s[256]; - char *str; + char* str; } // Offset: 34848 @@ -900,15 +901,15 @@ void GetThreeIntsAndAString(FILE *pF, int *pF1, int *pF2, int *pF3, char *pS) { // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetFourInts(FILE *pF, int *pF1, int *pF2, int *pF3, int *pF4) { +void GetFourInts(FILE* pF, int* pF1, int* pF2, int* pF3, int* pF4) { char s[256]; - char *str; + char* str; } // Offset: 35056 // Size: 51 // EAX: pF -br_scalar GetAScalar(FILE *pF) { +br_scalar GetAScalar(FILE* pF) { } // Offset: 35108 @@ -916,7 +917,7 @@ br_scalar GetAScalar(FILE *pF) { // EAX: pF // EDX: pS1 // EBX: pS2 -void GetPairOfScalars(FILE *pF, br_scalar *pS1, br_scalar *pS2) { +void GetPairOfScalars(FILE* pF, br_scalar* pS1, br_scalar* pS2) { } // Offset: 35180 @@ -925,7 +926,7 @@ void GetPairOfScalars(FILE *pF, br_scalar *pS1, br_scalar *pS2) { // EDX: pS1 // EBX: pS2 // ECX: pS3 -void GetThreeScalars(FILE *pF, br_scalar *pS1, br_scalar *pS2, br_scalar *pS3) { +void GetThreeScalars(FILE* pF, br_scalar* pS1, br_scalar* pS2, br_scalar* pS3) { } // Offset: 35264 @@ -934,9 +935,9 @@ void GetThreeScalars(FILE *pF, br_scalar *pS1, br_scalar *pS2, br_scalar *pS3) { // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetFourScalars(FILE *pF, br_scalar *pF1, br_scalar *pF2, br_scalar *pF3, br_scalar *pF4) { +void GetFourScalars(FILE* pF, br_scalar* pF1, br_scalar* pF2, br_scalar* pF3, br_scalar* pF4) { char s[256]; - char *str; + char* str; float f1; float f2; float f3; @@ -949,9 +950,9 @@ void GetFourScalars(FILE *pF, br_scalar *pF1, br_scalar *pF2, br_scalar *pF3, br // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetFiveScalars(FILE *pF, br_scalar *pF1, br_scalar *pF2, br_scalar *pF3, br_scalar *pF4, br_scalar *pF5) { +void GetFiveScalars(FILE* pF, br_scalar* pF1, br_scalar* pF2, br_scalar* pF3, br_scalar* pF4, br_scalar* pF5) { char s[256]; - char *str; + char* str; float f1; float f2; float f3; @@ -964,9 +965,9 @@ void GetFiveScalars(FILE *pF, br_scalar *pF1, br_scalar *pF2, br_scalar *pF3, br // EAX: pF // EDX: pNumber // EBX: pScalars -void GetNScalars(FILE *pF, int pNumber, br_scalar *pScalars) { +void GetNScalars(FILE* pF, int pNumber, br_scalar* pScalars) { char s[256]; - char *str; + char* str; float fleurting_point_numero; int i; } @@ -976,9 +977,9 @@ void GetNScalars(FILE *pF, int pNumber, br_scalar *pScalars) { // EAX: pF // EDX: pF1 // EBX: pF2 -void GetPairOfFloatPercents(FILE *pF, float *pF1, float *pF2) { +void GetPairOfFloatPercents(FILE* pF, float* pF1, float* pF2) { char s[256]; - char *str; + char* str; } // Offset: 36104 @@ -987,18 +988,18 @@ void GetPairOfFloatPercents(FILE *pF, float *pF1, float *pF2) { // EDX: pF1 // EBX: pF2 // ECX: pF3 -void GetThreeFloatPercents(FILE *pF, float *pF1, float *pF2, float *pF3) { +void GetThreeFloatPercents(FILE* pF, float* pF1, float* pF2, float* pF3) { char s[256]; - char *str; + char* str; } // Offset: 36312 // Size: 82 // EAX: pF // EDX: pString -void GetAString(FILE *pF, char *pString) { +void GetAString(FILE* pF, char* pString) { char s[256]; - char *str; + char* str; } // Offset: 36396 @@ -1009,21 +1010,21 @@ void AboutToLoadFirstCar() { // Offset: 36448 // Size: 275 // EAX: pRace_info -void LoadOpponentsCars(tRace_info *pRace_info) { +void LoadOpponentsCars(tRace_info* pRace_info) { int i; } // Offset: 36724 // Size: 184 // EAX: pRace_info -void DisposeOpponentsCars(tRace_info *pRace_info) { +void DisposeOpponentsCars(tRace_info* pRace_info) { int i; } // Offset: 36908 // Size: 211 void LoadMiscStrings() { - FILE *f; + FILE* f; char s[256]; tPath_name the_path; } @@ -1031,19 +1032,19 @@ void LoadMiscStrings() { // Offset: 37120 // Size: 53 // EAX: pThe_race -void FillInRaceInfo(tRace_info *pThe_race) { +void FillInRaceInfo(tRace_info* pThe_race) { } // Offset: 37176 // Size: 1156 // EAX: pFilename // EDX: pMode -FILE* OldDRfopen(char *pFilename, char *pMode) { - FILE *fp; - FILE *file_ptr; - FILE *test1; - FILE *test2; - char *data_dir; +FILE* OldDRfopen(char* pFilename, char* pMode) { + FILE* fp; + FILE* file_ptr; + FILE* test1; + FILE* test2; + char* data_dir; tPath_name CD_dir; tPath_name path_file; tPath_name source_check; @@ -1065,8 +1066,8 @@ void DoNotAllowOpenToFail() { // Size: 189 // EAX: pFilename // EDX: pMode -FILE* DRfopen(char *pFilename, char *pMode) { - FILE *result; +FILE* DRfopen(char* pFilename, char* pMode) { + FILE* result; tPath_name CD_dir; char msg[336]; } @@ -1074,16 +1075,16 @@ FILE* DRfopen(char *pFilename, char *pMode) { // Offset: 38604 // Size: 178 // EAX: pPath_name -int GetCDPathFromPathsTxtFile(char *pPath_name) { +int GetCDPathFromPathsTxtFile(char* pPath_name) { static int got_it_already = 0; static tPath_name cd_pathname; - FILE *paths_txt_fp; + FILE* paths_txt_fp; tPath_name paths_txt; - if ( !got_it_already ) { + if (!got_it_already) { sprintf(paths_txt, "%s%s%s", gApplication_path, gDir_separator, "PATHS.TXT"); paths_txt_fp = fopen(paths_txt, "rt"); - if ( !paths_txt_fp ) { + if (!paths_txt_fp) { return 0; } GetALineAndDontArgue(paths_txt_fp, cd_pathname); @@ -1113,29 +1114,29 @@ int CarmaCDinDriveOrFullGameInstalled() { // Size: 191 // EAX: pF // EDX: pOptions -void ReadNetworkSettings(FILE *pF, tNet_game_options *pOptions) { +void ReadNetworkSettings(FILE* pF, tNet_game_options* pOptions) { } // Offset: 39132 // Size: 378 // EAX: pF // EDX: pIndex -int PrintNetOptions(FILE *pF, int pIndex) { +int PrintNetOptions(FILE* pF, int pIndex) { } // Offset: 39512 // Size: 1398 int SaveOptions() { - FILE *f; + FILE* f; } // Offset: 40912 // Size: 1643 int RestoreOptions() { - FILE *f; + FILE* f; char line[80]; char token[80]; - char *s; + char* s; float arg; } @@ -1143,4 +1144,3 @@ int RestoreOptions() { // Size: 75 void InitFunkGrooveFlags() { } - diff --git a/test/BRSRC13/test_brlists.c b/test/BRSRC13/test_brlists.c index ac5e7bfa..bd31ebb4 100644 --- a/test/BRSRC13/test_brlists.c +++ b/test/BRSRC13/test_brlists.c @@ -10,18 +10,17 @@ void test_brlists_BrSimpleList() { br_simple_node* two = calloc(1, sizeof(br_simple_node)); br_simple_node* three = calloc(1, sizeof(br_simple_node)); - printf("lisr %p, 1 %p, 2 %p, 3 %p\n", list, one, two, three); - BrSimpleNewList(list); TEST_ASSERT_NULL(list->head); BrSimpleAddHead(list, one); + // expected 1->null TEST_ASSERT_EQUAL_PTR(one, list->head); TEST_ASSERT_NULL(one->next); TEST_ASSERT_EQUAL_PTR(list, one->prev); BrSimpleAddHead(list, two); - // expected 2->1 + // expected 2->1->null TEST_ASSERT_EQUAL_PTR(two, list->head); TEST_ASSERT_EQUAL_PTR(one, two->next); TEST_ASSERT_EQUAL_PTR(list, two->prev); @@ -30,8 +29,7 @@ void test_brlists_BrSimpleList() { TEST_ASSERT_NULL(one->next); BrSimpleAddHead(list, three); - // expected 3->2->1 - //printf("prevs: %p, %p, %p\n", one.prev, two.prev, three.prev); + // expected 3->2->1->null TEST_ASSERT_EQUAL_PTR(two, one->prev); TEST_ASSERT_EQUAL_PTR(three, list->head); @@ -43,6 +41,11 @@ void test_brlists_BrSimpleList() { TEST_ASSERT_EQUAL_PTR(two, one->prev); TEST_ASSERT_NULL(one->next); + + free(list); + free(one); + free(two); + free(three); } void test_brlists_suite() { diff --git a/test/main.c b/test/main.c index 14bd6c6e..115bcce2 100644 --- a/test/main.c +++ b/test/main.c @@ -33,8 +33,6 @@ void tearDown(void) { int main(int pArgc, char** pArgv) { - debug("hi %d\n", 3); - UNITY_BEGIN(); // BRSRC13 diff --git a/tools/watcom-codegen/codegen.py b/tools/watcom-codegen/codegen.py index 28886e97..c8f162e0 100755 --- a/tools/watcom-codegen/codegen.py +++ b/tools/watcom-codegen/codegen.py @@ -84,6 +84,7 @@ def unread_line(): def read_file(): state = STATE_NONE + current_module = None while eof == 0: line = read_line() @@ -96,10 +97,8 @@ def read_file(): match = re.match(module_start_regex, line) if match: - if len(modules) > 0: - m = modules[len(modules)-1] - # if 'depth.c' in m['name']: - # break + if current_module is not None: + cleanup_function_args(current_module) current_module = { 'name': match.group(1), @@ -131,7 +130,7 @@ def read_file(): last_fn = None elif local_type == 'NEAR_RTN_386' or local_type == 'FAR_RTN_386': - fn = process_function() + fn = process_function(current_module) last_fn = fn current_module['functions'].append(fn) @@ -187,7 +186,7 @@ def process_global_var(): glob['type'] = match.group(3) return glob -def process_function(): +def process_function(module): fn = { 'args': [], 'local_vars': [] } #start off = 00000000, code size = 000000C9, parent off = 0000 @@ -380,31 +379,6 @@ def resolve_type_str(module, type_idx, var_name, decl=True): #print 'resolved to', type_idx, t #return resolve_name_for_type(module, type_idx) + ' ' + indirections + '{}' + bounds - -# def resolve_type(module, type_idx): -# result='' -# t = module['types'][type_idx] -# while 'base_type' in t: -# if t['type'] == 'NEAR386 PTR' or t['type'] == 'FAR386 PTR': -# result = '*' + result -# t = module['types'][t['base_type']] -# elif t['type'] == 'WORD_INDEX ARRAY' or t['type'] == 'BYTE_INDEX ARRAY': -# inner_type = resolve_type(module, t['base_type']) -# return inner_type + '[' + str(t['upper_bound']) + ']' - -# if t['type'] == 'NEAR386 PROC': -# return resolve_type(module, t['return_type']) + '(*' + describe_args(module, t, False) + result -# if 'value' in t: -# return t['value'] + result -# else: -# t2 = get_child_reference(module, type_idx) -# if t2 is not None: -# return t2['value'] + result - -# print (t) -# return t['type_name'] + result - - def resolve_function_header(module, fn): text = '' text += '// Offset: ' + str(fn['offset']) + '\n// Size: ' + str(fn['size']) @@ -413,8 +387,20 @@ def resolve_function_header(module, fn): text += '\n' name = fn['local_vars'][i]['name'] text += '// ' + fn['args'][i] + ': ' + name + text += '\n//IDA: ' + resolve_function_ida_signature(module, fn) return text +def cleanup_function_args(module): + # if theres a single "void" argument for a function, we just remove it + for fn in module['functions']: + type_idx = fn['type'] + fn_type = module['types'][type_idx] + if len(fn_type['args']) == 1: + arg_type = resolve_type_str(module, fn_type['args'][0], '') + if arg_type == 'void': + fn_type['args'] = [] + + def get_function_arg_count(module, fn): type_idx = fn['type'] fn_type = module['types'][type_idx] @@ -441,13 +427,9 @@ def resolve_function_signature(module, fn): continue else: arg_type = module['types'][arg] - if 'value' in arg_type and arg_type['value'] == 'void': - continue name = fn['local_vars'][i]['name'] arg_type = resolve_type_str(module, arg, name, False) - if arg_type == 'void ?no_name?': - continue if len(args) != 0: args += ', ' args += arg_type @@ -457,13 +439,45 @@ def resolve_function_signature(module, fn): return return_type + ' ' + fn['name'] + '(' + args + ')' +def resolve_function_ida_signature(module, fn): + type_idx = fn['type'] + fn_type = module['types'][type_idx] + return_type = resolve_type_str(module, fn_type['return_type'], "") + args = '' + for i in range(len(fn_type['args'])): + arg = fn_type['args'][i] + + if arg not in module['types']: + continue + else: + arg_type = module['types'][arg] + + name = fn['local_vars'][i]['name'] + arg_type = resolve_type_str(module, arg, name, False) + if len(args) != 0: + args += ', ' + args += arg_type + if i < len(fn['args']): + args += '@<' + fn['args'][i] + '>' + + if is_function_vararg(module, fn): + args += ', ...' + + # void __usercall PathCat(char *pDestn_str@, char *pStr_1@, char *pStr_2@) + # float __usercall GetAFloat@(FILE *pF@) + return_reg = '' + if len(fn['args']) > 0 and 'return_value' in fn: + return_reg = '@<' + fn['return_value'] + '>' + call_type = '__cdecl' + if len(fn['args']) > 0: + call_type = '__usercall' + return return_type + ' ' + call_type + ' ' + fn['name'] + return_reg + '(' + args + ')' + def describe_args(module, fn_type, resolve_names): args = '' for i in range(len(fn_type['args'])): arg = fn_type['args'][i] arg_type = resolve_type_str(module, arg, '') - if arg_type == 'void': - continue if resolve_names: name = fn['local_vars'][i]['name'] @@ -643,10 +657,6 @@ def generate_c_file(module): # skip local variables that were passed in as arguments arg_count = get_function_arg_count(module, fn) - # if fn['name'] == 'DrawColumns': - # print 'xxxx' - # print fn - # print module['types'][fn['type']] for v in fn['local_vars'][arg_count:]: c_file.write(' ' * INDENT_SPACES) if 'CONST' in v['addr_type']: