falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove const char strings and osSyncPrintf calls

This commit is contained in:
Ryan Dwyer 2022-11-11 23:55:48 +10:00
parent 0fd7673c1b
commit bfa06b8c3e
33 changed files with 4 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -79,7 +79,7 @@ ANTIALIAS = 0
# If enabled (1), press L to show frate stats followed by D-right to toggle
# profiling information.
PROFILING = 1
PROFILING = 0
################################################################################

6
src/game/activemenu.c
View File

@ -932,13 +932,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum)
return gdl;
}
const char var7f1b2b34[] = "Here is where the activemenu sets favourites\n";
const char var7f1b2b64[] = "slot %d = guntype %d\n";
const char var7f1b2b7c[] = "put it in %d\n";
const char var7f1b2be0[] = "Put guntype %d in slot %d\n";
const char var7f1b2bfc[] = "ActiveMenu: Two or more equipped items of guntype %d\n";
const char var7f1b2c34[] = "FAV: Added gun %d to slot %d\n";
u8 var800719a0[][3] = { {0, 1, 2}, {3, 4, 5}, {6, 7, 8} };

23
src/game/bg.c
View File

@ -2651,29 +2651,6 @@ void bgLoadRoom(s32 roomnum)
}
}
const char var7f1b7420[] = "Checking Convex Room %d";
const char var7f1b7438[] = " Portal %d %s%s%.1f < %.1f";
const char var7f1b7454[] = "";
const char var7f1b7458[] = "";
const char var7f1b745c[] = " Convex Room Failed (1)";
const char var7f1b7474[] = " Portal %d %s%s%.1f > %.1f";
const char var7f1b7490[] = "";
const char var7f1b7494[] = "";
const char var7f1b7498[] = " Convex Room Failed (0)";
const char var7f1b74b0[] = "Checking Concave Room %d";
const char var7f1b74cc[] = " Checking Portal %d";
const char var7f1b74e0[] = "Reject P:%d (%s%s%.1f %.1f n3=%.1f)";
const char var7f1b7504[] = "";
const char var7f1b7508[] = "";
const char var7f1b750c[] = "Reject P:%d (%s%s%.1f %.1f n4=%.1f)";
const char var7f1b7530[] = "";
const char var7f1b7534[] = "";
const char var7f1b7538[] = " Full %d%s%s %.1f %.1f (%.1f %.1f)";
const char var7f1b755c[] = "";
const char var7f1b7560[] = "";
const char var7f1b7564[] = " Failed 2 - Crossed portal %d";
const char var7f1b7584[] = " Failed 1 - Crossed portal %d";
const char var7f1b75a4[] = " Passed";
void bgUnloadRoom(s32 roomnum)
{

53
src/game/bondgun.c
View File

@ -2095,10 +2095,6 @@ s32 bgunGetMinClipQty(s32 weaponnum, s32 funcnum)
return 1;
}
const char var7f1ab8ac[] = "changegunmem type %d CurrentPlayer->gunctrl.gunmemtype %d\n";
const char var7f1ab8e8[] = "LockTimer: %d\n";
const char var7f1ab8f8[] = "BriGun: Releasing gunmem - current gunmemtype %d gunmemnew %d\n";
const char var7f1ab938[] = "GiveMem: %d\n";
u32 var8007012c = 0x00000000;
u32 var80070130 = 0x00000000;
@ -3461,7 +3457,6 @@ void bgunTickGunLoad(void)
u32 stack;
if (player->gunctrl.gunloadstate == GUNLOADSTATE_MODEL) {
osSyncPrintf("BriGun: BriGunLoadTick process GUN_LOADSTATE_LOAD_OBJ\n");
ptr = *player->gunctrl.loadmemptr;
remaining = *player->gunctrl.loadmemremaining;
@ -3478,27 +3473,20 @@ void bgunTickGunLoad(void)
loadsize = ALIGN64(fileGetInflatedSize(player->gunctrl.loadfilenum)) + 0x8000;
osSyncPrintf("BriGun: Loading - %s, pMem 0x%08x Size %d\n");
if (loadsize > remaining) {
osSyncPrintf("BriGun: Warning: LoadSize > MemSize, clamping decomp. buffer from %d to %d (%d Bytes)\n", allocsize, remaining, remaining);
loadsize = remaining;
}
// Load the model file to ptr
g_LoadType = LOADTYPE_GUN;
osSyncPrintf("BriGun: obLoadto at 0x%08x, size %d\n", ptr, loadsize);
modeldef = fileLoadToAddr(player->gunctrl.loadfilenum, FILELOADMETHOD_EXTRAMEM, (u8 *)ptr, loadsize);
// Reserve some space for textures
allocsize = fileGetLoadedSize(player->gunctrl.loadfilenum) + 0xe00;
osSyncPrintf("BriGun: Used size %d (Ob Size %d)\n");
osSyncPrintf("BriGun: block len %d usedsize %d\n");
osSyncPrintf("BriGun: obln ram_len %d block_len %d\n");
osSyncPrintf("BriGun: new used size %d\n");
fileGetLoadedSize(player->gunctrl.loadfilenum);
@ -3509,7 +3497,6 @@ void bgunTickGunLoad(void)
if (1);
remaining -= allocsize;
osSyncPrintf("BriGun: Texture Block at 0x%08x size %d, endp 0x%08x\n");
texInitPool(&player->gunctrl.unk15c0, (u8 *)end, remaining);
@ -3522,13 +3509,11 @@ void bgunTickGunLoad(void)
player->gunctrl.nexttexturetoload = 0;
player->gunctrl.fileinfo = *fileinfo;
osSyncPrintf("BriGun: Set Load State: GUN_LOADSTATE_DECOMPRESS_TEXTURES\n");
player->gunctrl.gunloadstate = GUNLOADSTATE_TEXTURES;
return;
}
if (player->gunctrl.gunloadstate == GUNLOADSTATE_TEXTURES) {
osSyncPrintf("BriGun: BriGunLoadTick process GUN_LOADSTATE_DECOMPRESS_TEXTURES\n");
gunfileinfo = &player->gunctrl.fileinfo;
fileinfo = &g_FileInfo[player->gunctrl.loadfilenum];
@ -3539,10 +3524,8 @@ void bgunTickGunLoad(void)
numthistick = 0;
for (i = player->gunctrl.nexttexturetoload; i < modeldef->numtexconfigs; i++) {
osSyncPrintf("BriGun: at texture %d\n", i);
if (modeldef->texconfigs[i].texturenum < NUM_TEXTURES) {
osSyncPrintf("BriGun: Uncompress %d of %d\n", i, modeldef->numtexconfigs);
texLoad(&modeldef->texconfigs[i].texturenum, &player->gunctrl.unk15c0, true);
modeldef->texconfigs[i].unk0b = 1;
}
@ -3561,13 +3544,11 @@ void bgunTickGunLoad(void)
*gunfileinfo = *fileinfo;
osSyncPrintf("BriGun: Set Load State: GUN_LOADSTATE_DECOMPRESS_DLS\n");
player->gunctrl.gunloadstate = GUNLOADSTATE_DLS;
return;
}
if (player->gunctrl.gunloadstate == GUNLOADSTATE_DLS) {
osSyncPrintf("BriGun: BriGunLoadTick process GUN_LOADSTATE_DECOMPRESS_DLS\n");
fileinfo = &g_FileInfo[player->gunctrl.loadfilenum];
*fileinfo = player->gunctrl.fileinfo;
@ -3582,9 +3563,6 @@ void bgunTickGunLoad(void)
modelCalculateRwDataLen(modeldef);
osSyncPrintf("BriGun: propgfx_decompress 0x%08x\n");
osSyncPrintf("BriGun: DL waste space %d from %d (Used %d, Ramlen %d, ObSize %d)\n");
osSyncPrintf("Increase GUNSAVESIZE to %d!!!\n");
newvalue = ALIGN64(texGetPoolLeftPos(&player->gunctrl.unk15c0));
remaining = *player->gunctrl.loadmemremaining;
@ -3593,40 +3571,10 @@ void bgunTickGunLoad(void)
*player->gunctrl.loadmemptr = newvalue;
*player->gunctrl.loadmemremaining = remaining;
osSyncPrintf("BriGun: Set Load State: GUN_LOADSTATE_LOADED\n");
player->gunctrl.gunloadstate = GUNLOADSTATE_LOADED;
}
}
const char var7f1abcd8[] = "need a new gun loading (lock %d gunmemnew %d)\n";
const char var7f1abd08[] = "loading gun file: %d type: %d\n";
const char var7f1abd28[] = "BriGun: Process MASTER_GUN_LOADSTATE_FLUX\n";
const char var7f1abd54[] = "BriGun: Set Master State: MASTER_GUN_LOADSTATE_HANDS\n";
const char var7f1abd8c[] = "BriGun: Process MASTER_GUN_LOADSTATE_HANDS\n";
const char var7f1abdb8[] = "BriGun: Setup Hand Load\n";
const char var7f1abdd4[] = "Hand : Using cached hands\n";
const char var7f1abdf0[] = "Hand : Look ma no hands!\n";
const char var7f1abe0c[] = "BriGun: Set Master State: MASTER_GUN_LOADSTATE_GUN\n";
const char var7f1abe40[] = "BriGun: Process MASTER_GUN_LOADSTATE_GUN\n";
const char var7f1abe6c[] = "BriGun: Setup Gun Load\n";
const char var7f1abe84[] = "BriGun: Set Master State: MASTER_GUN_LOADSTATE_CARTS\n";
const char var7f1abebc[] = "BriGun: Process MASTER_GUN_LOADSTATE_CARTS\n";
const char var7f1abee8[] = "BriGun: Cart Loaded setting GUN_LOADSTATE_FLUX\n";
const char var7f1abf18[] = "BriGun: Cart loading - looking for carts\n";
const char var7f1abf44[] = "BriGun: Loading cart %d\n";
const char var7f1abf60[] = "BriGun: Request for cart %d ignored - cart already loaded\n";
const char var7f1abf9c[] = "BriGun: Compile Hand 0x%08x Gun 0x%0x8\n";
const char var7f1abfc4[] = "Gun : Compiled Gun 0x%08x\n";
const char var7f1abfe4[] = "Gun : Compiled Size %d\n";
const char var7f1ac000[] = "Hand : Compiled Hand 0x%08x\n";
const char var7f1ac020[] = "Hand : Compiled Size %d\n";
const char var7f1ac03c[] = "Gun : Compile overhead %d bytes\n";
const char var7f1ac060[] = "Hand : Hand Obj 0x%08x Gun Obj 0x%08x \n";
const char var7f1ac08c[] = "Gun : After Comp : Base 0x%08x Free %d\n";
const char var7f1ac0b8[] = "Gun : After Cached Setup : Base 0x%08x Free %d\n";
const char var7f1ac0ec[] = "Gun : TotalUsed %d, Free %d\n";
const char var7f1ac10c[] = "BriGun: Set Master State: MASTER_GUN_LOADSTATE_LOADED\n";
const char var7f1ac144[] = "GunLockTimer: %d\n";
void bgunTickMasterLoad(void)
{
@ -5481,7 +5429,6 @@ char *bgunGetShortName(s32 weaponnum)
return "** error\n";
}
const char var7f1ac170[] = "wantedfn %d tiggle %d\n";
void bgunReloadIfPossible(s32 handnum)
{

7
src/game/chraction.c
View File

@ -9453,7 +9453,6 @@ void chrCalculateTrajectory(struct coord *frompos, f32 arg1, struct coord *aimpo
arg3->z = zvel / latvel * sp28;
}
const char var7f1a8ae4[] = "aimadjust=%d";
/**
* Fire the chr's gun, check what was hit and do all the appropriate things
@ -10049,25 +10048,19 @@ void chrTickShoot(struct chrdata *chr, s32 handnum)
}
}
// osSyncPrintf is defined to nothing, so these print statements
// get optimised out but leave their strings in rodata.
// The on/off strings are surely used in a ternary statement in the
// previous string, but making this a ternary creates a mismatch.
osSyncPrintf("firing(%d) %d, beam(%d) %s", handnum, firingthisframe, handnum);
osSyncPrintf("on");
osSyncPrintf("off");
chrCreateFireslot(chr, handnum, firingthisframe, firingthisframe && makebeam, &gunpos, &hitpos);
if (isaibot) {
if (firingthisframe) {
osSyncPrintf("firecount(%d) = %d", handnum, chr->aibot->loadedammo[handnum]);
if (chr->aibot->loadedammo[handnum] > 0) {
chr->aibot->loadedammo[handnum]--;
}
osSyncPrintf("numshots(%d) = %d", handnum, chr->aibot->loadedammo[handnum]);
}
chrSetFiring(chr, handnum, firingthisframe && normalshoot);

39
src/game/dlights.c
View File

@ -29,31 +29,6 @@
#include "data.h"
#include "types.h"
const char var7f1a78e0[] = "LIGHTS : Hit occured on light %d in room %d\n";
const char var7f1a7910[] = "L2(%d) -> ";
const char var7f1a791c[] = "L2 -> BUILD LIGHTS TRANSFER TABLE - Starting\n";
const char var7f1a794c[] = "L2(%d) -> ";
const char var7f1a7958[] = "L2_BuildTransferTables -> Found %d portals\n";
const char var7f1a7984[] = "L2(%d) -> ";
const char var7f1a7990[] = "L2_BuildTransferTables -> Found %d rooms\n";
const char var7f1a79bc[] = "L2(%d) -> ";
const char var7f1a79c8[] = "L2_BuildTransferTables -> Alloc %u bytes of free memory\n";
const char var7f1a7a04[] = "L2(%d) -> ";
const char var7f1a7a10[] = "L2_BuildTransferTables -> Alloc %u bytes for scratch\n";
const char var7f1a7a48[] = "L2(%d) -> ";
const char var7f1a7a54[] = "L2 -> Building room based light transmission table\n";
const char var7f1a7a88[] = "L2(%d) -> ";
const char var7f1a7a94[] = "L2 -> Finished\n";
const char var7f1a7aa4[] = "L2(%d) -> ";
const char var7f1a7ab0[] = "L2 -> Generating room parameters from BG data\n";
const char var7f1a7ae0[] = "L2(%d) -> ";
const char var7f1a7aec[] = "L2 -> Light2_ProcessBgParams room %d does not have a 3D bounding box => Room Volume is bodged!\n";
const char var7f1a7b4c[] = "L2(%d) -> ";
const char var7f1a7b58[] = "%s%sL2 -> Surface area bodged for room %d - using %f\n";
const char var7f1a7b90[] = "";
const char var7f1a7b94[] = "";
const char var7f1a7b98[] = "L2(%d) -> ";
const char var7f1a7ba4[] = "L2 -> Finished\n";
s32 *var8009cad0;
u32 var8009cad4;
@ -1036,20 +1011,6 @@ bool lightTickBroken(s32 roomnum, s32 lightnum)
return false;
}
const char var7f1a7bcc[] = "L2 - g_bfGlobalLightRebuild = %d";
const char var7f1a7bf0[] = "Acoustic Shadowing is %s";
const char var7f1a7c0c[] = "Enabled";
const char var7f1a7c14[] = "Disabled";
const char var7f1a7c20[] = "L2 - Fading Rm%d - Mode=%d%%";
const char var7f1a7c40[] = "RWI : Re-light all affected char props : g_bfGlobalLightRebuild";
const char var7f1a7c80[] = "L2 - %d Rooms have been processed";
const char var7f1a7ca4[] = "L2 - %d Chars need lighting";
const char var7f1a7cc0[] = "L2(%d) -> ";
const char var7f1a7ccc[] = "L2 -> Building portal range table (Num Portals = %d)\n";
const char var7f1a7d04[] = "L2(%d) -> ";
const char var7f1a7d10[] = "L2 -> Allocated %uK for the compressed acoustic shadow table\n";
const char var7f1a7d50[] = "L2(%d) -> ";
const char var7f1a7d5c[] = "L2 -> Finished building portal range table\n";
void lightingTick(void)
{

1
src/game/filelist.c
View File

@ -131,7 +131,6 @@ void filelistsTick(void)
}
if (update) {
osSyncPrintf("Rebuilding pakWad %d:\n", i);
filelistUpdate(g_FileLists[i]);
g_FileLists[i]->updatedthisframe = true;
}

9
src/game/filemgr.c
View File

@ -1083,7 +1083,6 @@ void filemgrGetFileName(char *dst, struct filelistfile *file)
sprintf(dst, "%s", localbuffer);
}
const char var7f1b3294[] = "GETFileNameForThePurposesOfTheFileRenamingChecker: Unknown type %d\n";
void filemgrGetRenameName(char *buffer)
{
@ -1158,7 +1157,6 @@ void filemgrSetRenameName(char *name)
}
}
const char var7f1b32dc[] = "SetFileNameForThePurposesOfTheFileRenamingChecker: Unknown type %d\n";
bool filemgrIsNameAvailable(s32 device)
{
@ -1214,7 +1212,6 @@ bool filemgrIsNameAvailable(s32 device)
}
}
osSyncPrintf("CheckFileName: Comparing range %d-%d\n", startindex, endindex);
// Iterate files
for (i = startindex; i < endindex; i++) {
@ -1235,10 +1232,8 @@ bool filemgrIsNameAvailable(s32 device)
}
// Compare names
osSyncPrintf("Compare '%s' to '%s' = %d\n", findname, loopname, strcmp(findname, loopname));
if (strcmp(findname, loopname) == 0) {
osSyncPrintf("OI! DUPLICATE FILE NAME! NO!\n");
return false;
}
}
@ -1246,10 +1241,6 @@ bool filemgrIsNameAvailable(s32 device)
return true;
}
const char var7f1b3384[] = "()()()()()() Writing MPLAYER\n";
const char var7f1b33a4[] = "()()()()()() Writing MGAME\n";
const char var7f1b33c0[] = "Write Attempt Made...\n";
const char var7f1b33d8[] = "decided location: %d\n";
/**
* Used for both saving new files and copying files.

16
src/game/gamefile.c
View File

@ -39,16 +39,6 @@ u32 gamefileHasFlag(u32 value)
return pakHasBitflag(value, g_GameFile.flags);
}
void gamefilePrintFlags(void)
{
s32 i;
for (i = 0x23; i != 0x4f; i++) {
osSyncPrintf("Flag %d = %s", i,
pakHasBitflag(i, g_GameFile.flags) ? "TRUE" : "FALSE");
}
}
void gamefileApplyOptions(struct gamefile *file)
{
s32 player1 = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? 0 : 4;
@ -208,12 +198,6 @@ void gamefileLoadDefaults(struct gamefile *file)
gamefileApplyOptions(file);
}
const char var7f1b38e8[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)";
const char var7f1b391c[] = "pdoptions.c";
const char var7f1b3928[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)";
const char var7f1b395c[] = "pdoptions.c";
const char var7f1b3968[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)";
const char var7f1b399c[] = "pdoptions.c";
s32 gamefileLoad(s32 device)
{

5
src/game/lv.c
View File

@ -1596,7 +1596,6 @@ Gfx *lvRender(Gfx *gdl)
return gdl;
}
const char var7f1b7730[] = "fr: %d\n";
u32 g_CutsceneTime240_60 = 0;
@ -2086,10 +2085,6 @@ void lvTick(void)
}
}
const char var7f1b7738[] = "cutsceneframe: %d\n";
const char var7f1b774c[] = "pos:%s%s %.2f %.2f %.2f\n";
const char var7f1b7768[] = "";
const char var7f1b776c[] = "";
void lvTickPlayer(void)
{

24
src/game/menu.c
View File

@ -724,19 +724,6 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc
}
}
const char var7f1b2400[] = "(BNC:Menu) findItem Warning: Item not found\n";
const char var7f1b2430[] = "(BNC:Menu) menuFirstFocus - Menu %s does not have any focusable item!\n";
const char var7f1b2478[] = "(BNC:Menu) menuLastFocus - Menu %s does not have any focusable item!\n";
const char var7f1b24c0[] = "Init menu %x\n";
const char var7f1b24d0[] = "[]-[] Added Main menu to ctl slot %d\n";
const char var7f1b24f8[] = "[]-[] Added Slide menu to ctl slot %d\n";
const char var7f1b2520[] = "[]-[] StackStart Stats: slides %d, ctlPtr %d slidePtr %d\n";
const char var7f1b255c[] = "$-$-$avePtr: %d\n";
const char var7f1b2570[] = "[]-[] Menu End: now %d slides\n";
const char var7f1b2590[] = "Freeing challenge mem\n";
const char var7f1b25a8[] = "IG:) style %d gbHead:%d\n";
const char var7f1b25c4[] = "GRABBED GUN MEM!\n";
const char var7f1b25d8[] = "Freeing challenge mem\n";
void func0f0f1d6c(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu)
{
@ -2828,11 +2815,6 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l
return gdl;
}
const char var7f1b2668[] = "[]-[] Terminate Complete\n";
const char var7f1b2684[] = "Enabling control %d\n";
const char var7f1b269c[] = "NOT IN MODE MULTIINGAME!\n";
const char var7f1b26b8[] = "Numactive now:%d\n";
const char var7f1b26cc[] = "[]-[] SwitchMenuMode called, context %d\n";
void menuGetContPads(s8 *contpadnum1, s8 *contpadnum2)
{
@ -3318,11 +3300,6 @@ Gfx *menuRenderDialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bo
return gdl;
}
const char var7f1b2700[] = "[]-[] slide from %d";
const char var7f1b2714[] = " to %d\n";
const char var7f1b271c[] = "UNPAUSE: enabling control 0\n";
const char var7f1b273c[] = "file: type %d guid %x-%x data %x err %d\n";
const char var7f1b2768[] = "StartSelects\n";
/**
* Render all dialogs for the current player.
@ -5084,7 +5061,6 @@ Gfx *menuRender(Gfx *gdl)
return gdl;
}
const char var7f1b27a4[] = "Tune Selector - mode %d\n";
u32 menuChooseMusic(void)
{

8
src/game/menutick.c
View File

@ -33,14 +33,6 @@ u8 var80062944 = 0;
u8 var80062948 = 0;
u8 var8006294c = 0;
const char var7f1a85b0[] = "lvup: %d\n";
const char var7f1a85bc[] = "file id %x-%x";
const char var7f1a85cc[] = " ticking: ";
const char var7f1a85d8[] = "1";
const char var7f1a85dc[] = "0";
const char var7f1a85e0[] = "Live: %d\n";
const char var7f1a85ec[] = "current:";
const char var7f1a85f8[] = " numactive %d ";
void menuCountDialogs(void)
{

16
src/game/modelmgr.c
View File

@ -91,13 +91,6 @@ void modelmgrPrintCounts(void)
g_ModelMostAnims = numanims;
}
osSyncPrintf("MOT : Type 1 = %d/%d (%d)");
osSyncPrintf("MOT : Type 2 = %d/%d (%d)");
osSyncPrintf("MOT : Type 3 = %d/%d (%d)");
osSyncPrintf("MOT : Type OI = %d/%d/%d/%d");
osSyncPrintf("MOT : Type OA = %d/%d/%d/%d");
osSyncPrintf("MOT : g_ObjCount = %d");
osSyncPrintf("MOT : g_AnimCount = %d");
}
struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool withanim)
@ -132,7 +125,6 @@ struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool with
}
if (model == NULL) {
osSyncPrintf("Allocating %d bytes for objinst structure\n", ALIGN16(sizeof(struct model)));
model = mempAlloc(ALIGN16(sizeof(struct model)), MEMPOOL_STAGE);
}
@ -152,7 +144,6 @@ struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool with
if (modeldef->rwdatalen <= 4) {
for (i = 0; i < NUMTYPE1(); i++) {
if (g_ModelRwdataBindings[0][i].model == NULL) {
osSyncPrintf("MotInst: Using cache entry type 1 %d (0x%08x) - Bytes=%d\n");
rwdatas = g_ModelRwdataBindings[0][i].rwdata;
g_ModelRwdataBindings[0][i].model = model;
done = true;
@ -165,7 +156,6 @@ struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool with
if (!done && modeldef->rwdatalen <= 52) {
for (i = 0; i < NUMTYPE2(); i++) {
if (g_ModelRwdataBindings[1][i].model == NULL) {
osSyncPrintf("MotInst: Using cache entry type 2 %d (0x%08x) - Bytes=%d\n");
rwdatas = g_ModelRwdataBindings[1][i].rwdata;
g_ModelRwdataBindings[1][i].model = model;
done = true;
@ -179,7 +169,6 @@ struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool with
if (!done && modeldef->rwdatalen <= 256) {
for (i = 0; i < NUMTYPE3(); i++) {
if (g_ModelRwdataBindings[2][i].model == NULL && g_ModelRwdataBindings[2][i].rwdata != NULL) {
osSyncPrintf("MotInst: Using cache entry type 3 %d (0x%08x) - Bytes=%d\n");
rwdatas = g_ModelRwdataBindings[2][i].rwdata;
g_ModelRwdataBindings[2][i].model = model;
done = true;
@ -235,8 +224,6 @@ struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool with
model->rwdatalen = datalen;
}
osSyncPrintf("***************************************\n");
osSyncPrintf("***************************************\n");
return model;
}
@ -266,7 +253,6 @@ void modelmgrFreeModel(struct model *model)
if (!done) {
for (i = 0; i < NUMTYPE2(); i++) {
if (g_ModelRwdataBindings[1][i].model == model) {
osSyncPrintf("\nMotInst: Freeing type 2 cache entry %d (0x%08x)\n\n");
g_ModelRwdataBindings[1][i].model = NULL;
@ -282,7 +268,6 @@ void modelmgrFreeModel(struct model *model)
if (!done) {
for (i = 0; i < NUMTYPE3(); i++) {
if (g_ModelRwdataBindings[2][i].model == model) {
osSyncPrintf("\nMotInst: Freeing type 3 cache entry %d (0x%08x)\n\n");
g_ModelRwdataBindings[2][i].model = NULL;
model->rwdatas = NULL;
@ -295,7 +280,6 @@ void modelmgrFreeModel(struct model *model)
}
if (!done) {
osSyncPrintf("MotInst -> Attempt to free item not in cache\n");
}
if (model->anim) {

11
src/game/mplayer/mplayer.c
View File

@ -48,7 +48,6 @@ struct modelfiledata *var800acc28[18];
struct mpweaponset g_MpWeaponSets[12];
s32 g_MpWeaponSetNum;
const char var7f1b8a00[] = "||||||||||||| Starting game... players %d\n";
s32 var80087260 = 0x00000000;
bool g_MpEnableMusicSwitching = false;
@ -861,8 +860,6 @@ char *mpGetWeaponLabel(s32 weaponnum)
return "";
}
const char var7f1b8a5c[] = "Gun index %d -> slot %d = gun %d\n\n";
const char var7f1b8a80[] = "HOLDER: selecting weapon set %d\n";
void mpSetWeaponSlot(s32 slot, s32 mpweaponnum)
{
@ -1498,14 +1495,6 @@ void mpCalculatePlayerTitle(struct mpplayerconfig *mpplayer)
}
}
const char var7f1b8ad0[] = "%s%sAccuracy Peak! real value: %f (*100)\n";
const char var7f1b8afc[] = "";
const char var7f1b8b00[] = "";
const char var7f1b8b04[] = "%splayer %d Accuracy :%f\n";
const char var7f1b8b20[] = "";
const char var7f1b8b24[] = "%splayer %d dist:%f -> %f = %d\n";
const char var7f1b8b44[] = "";
const char var7f1b8b48[] = "Player %d TitleCalc ============\n";
struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS] = {
// head, require feature

6
src/game/mplayer/scenarios.c
View File

@ -189,7 +189,7 @@ struct mpscenario g_MpScenarios[] = {
NULL,
pacRenderHud,
pacCalculatePlayerScore,
pacRadarExtra,
NULL,
pacRadarChr,
pacHighlightProp,
}, {
@ -216,8 +216,8 @@ struct mpscenario g_MpScenarios[] = {
ctcInit,
ctcNumProps,
ctcInitProps,
ctcTick,
ctcTickChr,
NULL,
NULL,
NULL,
ctcCalculatePlayerScore,
ctcRadarExtra,

19
src/game/mplayer/scenarios/hackthatmac.inc
View File

@ -138,7 +138,6 @@ void htmAddPad(s16 padnum)
struct scenariodata_htm *data = &g_ScenarioData.htm;
if (data->numpads < ARRAYCOUNT(g_ScenarioData.htm.padnums)) {
osSyncPrintf("HackThatMacAddBankPad -> Adding New Pad %d - Pad Id = %d-> Saving Pad\n", data->numpads, padnum);
data->padnums[data->numpads] = padnum;
data->numpads++;
@ -149,7 +148,6 @@ void htmReset(void)
{
s32 i;
osSyncPrintf("HackThatMacReset -> Working\n");
g_ScenarioData.htm.numpads = 0;
g_ScenarioData.htm.numterminals = 0;
@ -264,7 +262,6 @@ void htmInitProps(void)
s32 i = 0;
s32 rand;
osSyncPrintf("HackThatMacInitProps -> Start : %d Bank Pads\n", data->numterminals);
while (prop) {
if (prop->type == PROPTYPE_OBJ) {
@ -272,7 +269,6 @@ void htmInitProps(void)
if (obj->type == OBJTYPE_AMMOCRATE || obj->type == OBJTYPE_MULTIAMMOCRATE) {
if (obj->modelnum == MODEL_MULTI_AMMO_CRATE) {
osSyncPrintf("HackThatMacInitProps -> Adding prop %d (%x)\n", i, obj->pad);
htmAddPad(obj->pad);
}
}
@ -282,8 +278,6 @@ void htmInitProps(void)
i++;
}
osSyncPrintf("HackThatMacInitProps -> Mid : %d Bank Pads\n", data->numpads);
osSyncPrintf("HackThatMacInitProps -> Generating %d random box pads from %d in the bank\n", htmNumProps(), data->numpads);
data->numterminals = 0;
@ -303,10 +297,8 @@ void htmInitProps(void)
data->padnums[rand] = -1;
}
osSyncPrintf("HackThatMacInitProps -> %d/%d Random box pads generated - Listing\n", data->numterminals, htmNumProps());
for (i = 0; i < data->numterminals; i++) {
osSyncPrintf("Pad %d -> Pad Id = %d\n", i, data->terminals[i].padnum);
}
for (i = 0; i < HTM_NUM_TERMINALS; i++) {
@ -314,8 +306,6 @@ void htmInitProps(void)
OBJFLAG_00000001 | OBJFLAG_INVINCIBLE | OBJFLAG_00400000,
OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_00200000,
OBJFLAG3_HTMTERMINAL | OBJFLAG3_INTERACTABLE);
osSyncPrintf("HackThatMacInitProps -> Building and adding custom prop %d - Pad=%d, Ptr=%08x\n",
i, data->terminals[i].padnum, data->terminals[i].prop);
htbRemoveAmmoCrateAtPad(data->terminals[i].padnum);
}
@ -323,7 +313,6 @@ void htmInitProps(void)
htbCreateUplink();
osSyncPrintf("HackThatMacInitProps -> End\n");
}
void htmTick(void)
@ -492,13 +481,7 @@ void htmTickChr(struct chrdata *chr)
relangle = -relangle;
}
osSyncPrintf("HTM : Player %d - Term Pos = (%d,%d,%d)", playernum, (s32)terminalpos->x, (s32)terminalpos->y, (s32)terminalpos->z);
osSyncPrintf("HTM : Player %d - Play Pos = (%d,%d,%d)", playernum, (s32)chrpos->x, (s32)chrpos->y, (s32)chrpos->z);
osSyncPrintf("HTM : Player %d - T/P Rel = (%d,%d,%d)", playernum, (s32)dist.x, (s32)dist.y, (s32)dist.z);
osSyncPrintf("HTM : Player %d - Range XZ = %d", playernum, rangexz);
osSyncPrintf("HTM : Player %d - Range Y = %d", playernum, rangey);
osSyncPrintf("HTM : Player %d - Angle XZ = %d", playernum, relangle);
if (rangexz > 250 || rangey > 200 || relangle > 45 || !holdinguplink) {
if (rangexz < 250 && rangey < 200) {
@ -537,8 +520,6 @@ void htmTickChr(struct chrdata *chr)
}
}
osSyncPrintf("HTM : Player %d - Dwnld Plr=%d, Dwnld Prop=%d\n", playernum, data->playernuminrange, data->terminals[data->dlterminalnum].prop);
osSyncPrintf("HTM : Player %d - Download Time = %d", playernum, *time);
}
}

1
src/game/mplayer/scenarios/holdthebriefcase.inc
View File

@ -132,7 +132,6 @@ void htbAddPad(s16 padnum)
struct scenariodata_htb *data = &g_ScenarioData.htb;
if (data->nextindex < ARRAYCOUNT(data->padnums)) {
osSyncPrintf("CaptureTheBriefcaseAddBankPad -> Adding New Pad %d - Pad Id = %d-> Saving Pad\n", data->nextindex, padnum);
data->padnums[data->nextindex] = padnum;
data->nextindex++;

6
src/game/mplayer/scenarios/popacap.inc
View File

@ -125,7 +125,6 @@ void pacReset(void)
data->victimindex = -1;
data->age240 = 0;
osSyncPrintf("PopACapReset -> num_mplayers=%d : Working\n", g_MpNumChrs);
for (i = 0; i != MAX_MPCHRS; i++) {
data->killcounts[i] = 0;
@ -151,13 +150,10 @@ void pacReset(void)
}
}
osSyncPrintf("PopACapReset -> Generated %d victims for this game : Listing\n", i);
for (j = 0; j < g_MpNumChrs; j++) {
osSyncPrintf("PopACapReset -> Victim %d is player %d\n", j, data->victims[j]);
}
osSyncPrintf("PopACapReset -> Done\n");
}
void pacInit(void)
@ -249,8 +245,6 @@ void pacTick(void)
if (data->victimindex == -1) {
pacApplyNextVictim();
osSyncPrintf("PopACapTick : Current Victim = %d (Player %d)\n",
data->victimindex, data->victims[data->victimindex]);
}
if (data->victimindex >= 0) {

2
src/game/mplayer/setup.c
View File

@ -732,8 +732,6 @@ s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerd
return 0;
}
const char var7f1b7ea8[] = "Menu99 -> Calling Camera Module Start\n";
const char var7f1b7ed0[] = "Menu99 -> Calling Camera Module Finish\n";
char *mpMenuTextKills(struct menuitem *item)
{ \

1
src/game/music.c
View File

@ -52,7 +52,6 @@ char *var80084100[] = {
"paused",
};
const char var7f1b7918[] = "MUSIC : activedeath=%d\n";
u16 musicGetVolume(void)
{

12
src/game/pak.c
View File

@ -128,8 +128,6 @@
#define JOYARGS(line)
const char g_N64FontCodeMap[] = "\0************** 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#'*+,-./:=?@";
const char var7f1b3ad4[] = "Pak %d -> Pak_UpdateAndGetPakNoteInfo - ERROR - ekPakErrorPakFatal\n";
const char var7f1b3b18[] = "Pak %d -> Pak_UpdateAndGetPakNoteInfo - ERROR - ekPakErrorNoPakPresent\n";
struct pak g_Paks[5];
@ -656,12 +654,10 @@ void pakDumpBuffer(u8 *buffer, u32 len, char *name)
char line[256];
char tmp[256];
osSyncPrintf(name);
sprintf(line, "\n");
for (i = 0; i != len; i++) {
if ((i % 16) == 0) {
osSyncPrintf(line);
sprintf(line, "\nAddress = %u : ", i);
}
@ -671,7 +667,6 @@ void pakDumpBuffer(u8 *buffer, u32 len, char *name)
strcat(line, "\n");
osSyncPrintf(line);
}
void pakDumpEeprom(void)
@ -768,7 +763,6 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil
}
if (outfileid) {
osSyncPrintf("PakSaveAtGuid: new guid = %x\n", outfileid);
}
// NTSC Beta skips marking the old file as vacant if the file wasn't found
@ -901,7 +895,6 @@ PakErr1 pakQueryNoteState(OSPfs *pfs, s32 file_no, OSPfsState *note)
return PAK_ERR1_OK;
}
const char var7f1b3c08[] = "Call to osPfsReSizeFile -> pfs=%x, cc=%u, gc=%u, gn=%s, en=%s, l=%d\n";
PakErr1 pakAllocateNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 size, s32 *file_no)
{
@ -1648,13 +1641,11 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header)
bodylen = pakGetBodyLenByFileLen(offset - start);
osSyncPrintf("Pak %d -> Pak_RepairAsBlank - St=%u, Ed=%u, Gap=%u, Blank Size=%u\n", device, start, offset, offset - start, bodylen);
// Write the blank file ranging from to the start to the current offset
result = pakWriteFileAtOffset(device, start, PAKFILETYPE_BLANK, NULL, bodylen, NULL, NULL, 0, 1);
if (result != 0) {
osSyncPrintf("Pak %d -> Pak_RepairAsBlank - Fatal Error at tOffset %u\n", device, offset);
*offsetptr = offset;
return false;
}
@ -2081,7 +2072,6 @@ void pakMergeBlanks(s8 device)
u32 filelen = offset - mergestartoffset + header.filelen - sizeof(struct pakfileheader);
if (pakWriteFileAtOffset(device, mergestartoffset, PAKFILETYPE_BLANK, NULL, filelen, NULL, NULL, 0, 1) != 0) {
osSyncPrintf("> Pak_DefragPak_Level1 - Merge of two blanks failed");
}
nextoffset = 0;
@ -2111,7 +2101,6 @@ void pak0f11a32c(s8 device, u8 arg1, u32 line, char *file)
g_Paks[device].headercachecount = 0;
g_Paks[device].headercache = mempAlloc(align32(sizeof(struct pakheadercache) * MAX_HEADERCACHE_ENTRIES), MEMPOOL_PERMANENT);
// This would have been used in an osSyncPrintf call.
// Perhaps using the strings at var7f1b4318 through var7f1b43ac?
align32(sizeof(struct pakheadercache) * MAX_HEADERCACHE_ENTRIES);
}
@ -2584,7 +2573,6 @@ bool pakGetFilesystemLength(s8 device, u32 *outlen)
return false;
}
const char var7f1b4508[] = "RWI : Warning : tOffset > gPakObj[PakNum].GameFileSize\n";
/**
* Read a file from cache or from the pak and write it to *data.

9
src/game/player.c
View File

@ -1288,25 +1288,20 @@ void playerTickChrBody(void)
offset1 = 0;
var8007fc0c = 8;
osSyncPrintf("Gunmem: 0x%08x\n", bgunGetGunMem());
allocation = g_Vars.currentplayer->gunmem2;
model = (struct model *)(allocation + offset1);
osSyncPrintf("Gunmem: bondsub 0x%08x\n", (u32)model);
offset1 += ALIGN64(sizeof(struct model));
model->anim = (struct anim *)(allocation + offset1);
osSyncPrintf("Gunmem: bondsub->anim 0x%08x\n", model->anim);
offset1 += sizeof(struct anim);
offset1 = ALIGN64(offset1);
rwdatas = (union modelrwdata **)(allocation + offset1);
osSyncPrintf("Gunmem: savedata 0x%08x\n", (u32)rwdatas);
offset1 += 0x400;
offset1 = ALIGN64(offset1);
weaponobj = (struct weaponobj *)(allocation + offset1);
osSyncPrintf("Gunmem: wo 0x%08x\n", (u32)weaponobj);
offset1 += sizeof(struct weaponobj);
offset1 = ALIGN64(offset1);
@ -1346,10 +1341,6 @@ void playerTickChrBody(void)
texGetPoolLeftPos(&texpool);
// @TODO: Figure out these arguments
osSyncPrintf("Jo using %d bytes gunmem (gunmemsize %d)\n");
osSyncPrintf("Gunmem: bondmeml 0x%08x size 0x%08x\n", bgunGetGunMem(), bgunCalculateGunMemCapacity());
osSyncPrintf("Gunmem: tex block free 0x%08x\n");
osSyncPrintf("Gunmem: Free at end %d\n");
texGetPoolLeftPos(&texpool);
} else {

11
src/game/portal.c
View File

@ -59,13 +59,6 @@
#include "data.h"
#include "types.h"
const char var7f1ad160[] = "ACOUSTIC -> Allocating %d bytes for %d portal AV structures\n";
const char var7f1ad1a0[] = "ACOUSTIC -> DGD WARNING: portalAVInit no portals!\n";
const char var7f1ad1d4[] = "ACOUSTIC -> portalAVReset: checking propobj type %d\n";
const char var7f1ad20c[] = "ACOUSTIC -> portalAVReset: found PROPDEF_WINDOWFADE for portal %d\n";
const char var7f1ad250[] = "ACOUSTIC -> portalAVReset: found PROPDEF_WINDOW for portal %d\n";
const char var7f1ad290[] = "ACOUSTIC -> Portal %3d - A=%.2f, V=%.2f\n";
const char var7f1ad2bc[] = "ACOUSTIC -> DGD WARNING: portalAVReset no portals!\n";
struct roomacousticdata *g_RoomAcousticData;
u32 var8009dd74;
@ -169,7 +162,6 @@ void acousticReset(void)
f32 depth;
f32 halfsurfacearea;
osSyncPrintf("Acoustic Reset -> Allocating %d bytes for %d roomacousticdata structures\n", size, g_Vars.roomcount);
g_RoomAcousticData = mempAlloc(size, MEMPOOL_STAGE);
@ -180,14 +172,12 @@ void acousticReset(void)
g_RoomAcousticData[i].surfacearea = 1;
for (j = 0; j < 3; j++) {
osSyncPrintf("ACOUSTIC -> room %d bb %f %f\n", i, g_Rooms[i].bbmin[j], g_Rooms[i].bbmax[j]);
range = g_Rooms[i].bbmax[j] - g_Rooms[i].bbmin[j];
if (range > 0) {
g_RoomAcousticData[i].roomvolume *= (g_Rooms[i].bbmax[j] - g_Rooms[i].bbmin[j]) / 100;
} else {
osSyncPrintf("ACOUSTIC -> DGD: acousticReset room %d does not have a 3D bounding box => radata[room].roomvolume is bodged!\n", i);
allgood = false;
}
}
@ -215,7 +205,6 @@ void acousticReset(void)
g_RoomAcousticData[i].surfacearea = halfsurfacearea + halfsurfacearea;
} else {
osSyncPrintf("%s%sL2 -> Surface area bodged for room %d - using %f\n", "", "", i, 20000000);
g_RoomAcousticData[i].surfacearea = 20000000;
}
}

8
src/game/propobj.c
View File

@ -7326,7 +7326,6 @@ struct escastepkeyframe g_EscaStepKeyframesZ[] = {
{ -1, { 0, 0, 0 } },
};
const char var7f1a9fe8[] = "************** RWI : Door Stuck Mate -> Sort it out\n";
void doorUpdatePortalIfWindowed(struct prop *doorprop, s32 playercount)
{
@ -9536,7 +9535,6 @@ void chopperTickCombat(struct prop *chopperprop)
if ((chopper->targetvisible && dist < 2000000.0f) || chopper->path == NULL) {
// Stay put
osSyncPrintf("HC: %x - visible\n", chopper);
goalpos = chopperprop->pos;
} else {
@ -14768,7 +14766,6 @@ void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual)
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
}
const char var7f1aa140[] = "autodoorcanclose: blocking door\n\n";
s32 propPickupByPlayer(struct prop *prop, bool showhudmsg)
{
@ -18148,11 +18145,6 @@ Gfx *countdownTimerRender(Gfx *gdl)
return gdl;
}
const char var7f1aa16c[] = "ALARM : PAN 1 = %d (%s%f)";
const char var7f1aa188[] = "";
const char var7f1aa18c[] = "ALARM : DIR 1 = %d";
const char var7f1aa1a0[] = "ALARM : ADD 1 = %d (%s%f)";
const char var7f1aa1bc[] = "";
void alarmTick(void)
{

1
src/game/radar.c
View File

@ -127,7 +127,6 @@ Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1,
f32 sqdist;
f32 spcc;
osSyncPrintf("RadarDrawDot : Prop=%x", prop);
spcc = (atan2f(dist->x, dist->z) * 180.0f) / M_PI + g_Vars.currentplayer->vv_theta + 180.0f;
sqdist = sqrtf(dist->z * dist->z + dist->x * dist->x) * (1.0f / 250.0f);

4
src/game/splat.c
View File

@ -65,7 +65,6 @@ void splatTickChr(struct prop *prop)
isskedar = true;
}
osSyncPrintf("Splat Tick - P=%x, B=%d, T=%d, S=%d, W=%d, D=%d, H=%d\n");
if (chr->actiontype == ACT_DEAD || chr->actiontype == ACT_DIE) {
u32 stack;
@ -80,7 +79,6 @@ void splatTickChr(struct prop *prop)
}
if (thudframe != -1.0f && modelGetCurAnimFrame(chr->model) < thudframe) {
osSyncPrintf("SPLAT : Not Dead Enough %s%s%f", "", "", modelGetCurAnimFrame(chr->model));
} else if (chr->tickssincesplat > TICKS(30) && chr->deaddropsplatsadded < 6) {
chr->deaddropsplatsadded += splatsCreate(1, 1.1f, prop, NULL, 0, 0, isskedar, SPLATTYPE_PUDDLE, TICKS(150), attacker, random() & 8);
}
@ -280,7 +278,6 @@ bool splat0f149274(f32 arg0, struct prop *chrprop, struct shotdata *shotdata, f3
room = bestroom;
translucent = hitthing.unk2c == 2;
} else {
osSyncPrintf("Splat : Out of range\n");
hasresult = false;
}
} else {
@ -473,7 +470,6 @@ void splat0f14986c(struct splatdata *splat)
void splatResetChr(struct chrdata *chr)
{
osSyncPrintf("Splat_ResetChr : Reset One Char : chrdata = %x\n", (u32)chr);
chr->bulletstaken = 0;
chr->tickssincesplat = 0;

3
src/game/tex.c
View File

@ -167,9 +167,6 @@ char *var80084494[] = {
"deep water",
};
const char var7f1b7c24[] = "";
const char var7f1b7c28[] = "";
const char var7f1b7c2c[] = "";
bool var800844d0 = false;
u32 var800844d4 = 0x00000000;

11
src/game/utils.c
View File

@ -7,13 +7,6 @@
#include "data.h"
#include "types.h"
const char var7f1b7cb0[] = "UM_Make : In\n";
const char var7f1b7cc0[] = "UM_Make : Out\n";
const char var7f1b7cd0[] = "Utils -> ERROR at Line %d of %s\n";
const char var7f1b7cf4[] = "Utils -> UM_fVec3_NormaliseTo - Vec = %s%s (%f,%f,%f)\n";
const char var7f1b7d2c[] = "";
const char var7f1b7d30[] = "";
const char var7f1b7d34[] = "Utils -> Attempt to normalise zeo length vector\n";
void *var800ac0d0;
u32 var800ac0d4;
@ -261,12 +254,10 @@ bool func0f1774b4(struct coord *arg0, struct coord *arg1, struct coord *out)
f32 mult;
if (!func0f177164(arg1, &a, 702, "utils.c")) {
osSyncPrintf("UTILS -> DEBUG ERROR - UM_fVec3_MakeNormalTo - Cant normalise\n");
return false;
}
if (!func0f177164(arg0, &b, 710, "utils.c")) {
osSyncPrintf("UTILS -> DEBUG ERROR - UM_fVec3_MakeNormalTo - Cant normalise\n");
return false;
}
@ -321,7 +312,6 @@ void func0f177624(struct coord *arg0, struct coord *arg1, struct coord *arg2, st
arg3->z = arg1->y * arg2->z;
}
const char var7f1b7e00[] = "WARNING - UTILS -> DEBUG - Triangle passed to Planar Poly Test\n";
f32 func0f1776cc(struct coord *a, struct coord *b, struct coord *c)
{
@ -502,7 +492,6 @@ u8 func0f177b44(u8 *arg0, s32 *arg1)
return arg0[var800ac108++];
}
const char var7f1b7e50[] = "UM_ZeroRunVerify_U8 - FAILED on item %d\n";
s32 func0f177bb4(u8 *arg0, s32 *arg1, s32 *arg2)
{

17
src/game/vtxstore.c
View File

@ -11,24 +11,7 @@
#include "data.h"
#include "types.h"
const char var7f1b5230[] = "VTXSTORE : vtxfixrefs -> Start - p1=%x, p2=%x\n";
const char var7f1b5260[] = "vtxfixrefs : Part=%x -- Mapping ptr %x -> %x\n";
const char var7f1b5290[] = "VTXSTORE : vtxfixrefs -> End - Done=%d\n";
const char var7f1b52b8[] = "vtxstorecheck : memaFree -> %u bytes at Ptr=%x(%x)\n";
const char var7f1b52ec[] = "vtxstorecheck : At block 1 %d -> Ref1=%x, Ref2=%x\n";
const char var7f1b5320[] = "vtxstorecheck : At block 2 %d -> Ref1=%x, Ref2=%x\n";
const char var7f1b5354[] = "vtx buffer low, need to delete objects\n";
const char var7f1b537c[] = "getfreevertices : %d of type %d -> ref1=%x, ref2=%x\n";
const char var7f1b53b4[] = "vtxstore: 1st mema alloc of %u bytes\n";
const char var7f1b53dc[] = "getfreevertices : Return ptr = %x\n";
const char var7f1b5400[] = "vtxstore: Out of mema (returning NULL)\n";
const char var7f1b5428[] = "vtxstore: GROSS! CorspeCount > MAX_CORPSES corpses! Freeing corpse %x\n";
const char var7f1b5470[] = "vtxstore: CorpseCount %d, Trying to free %d\n";
const char var7f1b54a0[] = "vtxstore: Freeing corpse %x\n";
const char var7f1b54c0[] = "vtxstore: Out of vertices type %d wanted %d free %d (returning NULL)\n";
const char var7f1b5508[] = "vtxstore: freevertices type %d, list %x\n";
const char var7f1b5534[] = "freevertices: address not found in array %x\n";
struct vtxstoretype g_VtxstoreTypes[] = {
{ 3000, 120, 3000, 80, 0, 0, 500, 20, 12, 0, 0, 0, 0 },

33
src/game/wallhit.c
View File

@ -26,7 +26,6 @@
#define IS_BLOOD_DROP(texnum) (texnum >= WALLHITTEX_BLOOD4 && texnum <= WALLHITTEX_BLOOD4)
const char var7f1b5a10[] = "WallHit_MakeSpaceRoom : ERROR - Couldn't find any space in room %d\n";
struct wallhit *g_Wallhits;
struct wallhit *g_FreeWallhits;
@ -604,35 +603,6 @@ void wallhitsTick(void)
}
}
const char var7f1b5a5c[] = "g_MaxRound = %s%s%f";
const char var7f1b5a70[] = "";
const char var7f1b5a74[] = "";
const char var7f1b5a78[] = "g_MinRound = %s%s%f";
const char var7f1b5a8c[] = "";
const char var7f1b5a90[] = "";
const char var7f1b5a94[] = "Done %d Z buffer calcs";
const char var7f1b5aac[] = "ZOOM : g_ZoomFactor=%s%s%f";
const char var7f1b5ac8[] = "";
const char var7f1b5acc[] = "";
const char var7f1b5ad0[] = "ZOOM : g_ZoomScalar=%s%s%f";
const char var7f1b5aec[] = "";
const char var7f1b5af0[] = "";
const char var7f1b5af4[] = "ZOOM : scale=%s%s%f";
const char var7f1b5b08[] = "";
const char var7f1b5b0c[] = "";
const char var7f1b5b10[] = "WallHit_Tick : Status - RED";
const char var7f1b5b2c[] = "WallHit_Tick : Status - YELLOW (%u)";
const char var7f1b5b50[] = "WallHit_Tick : Status - GREEN";
const char var7f1b5b70[] = "WallHit_Tick : %d Used";
const char var7f1b5b88[] = "WallHit_Tick : %d Free";
const char var7f1b5ba0[] = "WallHit_Tick : %d Pending";
const char var7f1b5bbc[] = "WallHit_Tick : %d Blood";
const char var7f1b5bd4[] = "WallHit_Tick : %d Other";
const char var7f1b5bec[] = "WallHit_Tick : %d Ratio";
const char var7f1b5c04[] = "WallHit_Tick : %d(%d) Prop Hits";
const char var7f1b5c24[] = "tLifeTime=%s%s%f, tScalarGbl=%f";
const char var7f1b5c44[] = "";
const char var7f1b5c48[] = "";
void wallhitCreate(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3],
s16 arg4[3], s16 texnum, s16 room, struct prop *objprop,
@ -852,8 +822,6 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co
sp1e8.z = sp1b8.y * zvalue;
}
osSyncPrintf("AFT : tVecU (along) = (%s%s%f,%f,%f)\n", "", "", sp1f4.x, sp1f4.y, sp1f4.z);
osSyncPrintf("AFT : tVecV (up) = (%s%s%f,%f,%f)\n", "", "", sp1e8.x, sp1e8.y, sp1e8.z);
if (rotdeg != 0) {
u32 stack[6];
@ -1056,7 +1024,6 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co
a = alpha ? alpha : 255;
break;
default:
osSyncPrintf("Wallhit colour %d not implemented, substituting black\n", type);
r = g = b = 0;
a = alpha ? alpha : 255;
break;

10
src/lib/joy.c
View File

@ -48,8 +48,6 @@ u8 g_JoyPfsStates[100];
u32 var80099fac;
u32 var80099fb0;
const char var70054080[] = "joyReset\n";
const char var7005408c[] = "joyReset: doing nothing\n";
struct joydata *g_JoyDataPtr = &g_JoyData[0];
bool g_JoyBusy = false;
@ -465,15 +463,7 @@ void joyDebugJoy(void)
}
}
const char var700540b4[] = "JOY : g_EnableCyclicPolling=%d";
const char var700540d4[] = "JOY : g_JoyReCheckInterval=%d";
const char var700540f4[] = "JOY : g_JoyReCheckEventIn=%d";
const char var70054114[] = "JOY : g_JoyRecheckDone=%d";
const char var70054130[] = "osContStartReadData -> Failed - CONT_NO_RESPONSE_ERROR\n";
const char var70054168[] = "osContStartReadData -> Failed - CONT_OVERRUN_ERROR\n";
const char var7005419c[] = "joyTickRetrace:joy%derrno%d->%d\n";
const char var700541c0[] = "joyTickRetrace:joy%derrno%d->%d\n";
s32 joyStartReadData(OSMesgQueue *mq)
{

21
src/lib/music.c
View File

@ -28,26 +28,19 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
switch (event->tracktype) {
case TRACKTYPE_NONE:
osSyncPrintf("OFF");
break;
case TRACKTYPE_PRIMARY:
osSyncPrintf("LEVELTUNE");
break;
case TRACKTYPE_NRG:
osSyncPrintf("NRGTUNE");
break;
case TRACKTYPE_MENU:
osSyncPrintf("WATCHTUNE");
break;
case TRACKTYPE_DEATH:
osSyncPrintf("MPDEATHTUNE");
break;
case TRACKTYPE_AMBIENT:
osSyncPrintf("AMBIENCE");
break;
}
osSyncPrintf(" after %d %s\n", event->failcount, event->failcount != 1 ? "Attempts" : "Attempt");
// Check if this tracktype is currently in use. If it is then that's
// an error - the caller should have stopped the existing track first.
@ -57,7 +50,6 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
for (j = 0; j < 16; j++) {
func00039e5c(g_SeqInstances[i].seqp, j, 0xff, value);
osSyncPrintf("MUSIC(Play) : Unpaused midi channel %d for state %d\n", j, event->tracktype);
}
var800aaa38[i].unk08 = 0;
@ -73,7 +65,6 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
// Find an unused channel
for (i = 0; i < 3; i++) {
if (n_alCSPGetState(g_SeqInstances[i].seqp) == AL_STOPPED) {
osSyncPrintf("MUSIC(Play) : Starting, Guid=%u, Midi=%d, Tune=%d\n", event->id, 0, event->tracktype);
if (seqPlay(&g_SeqInstances[i], event->tracknum)) {
seqSetVolume(&g_SeqInstances[i], event->volume);
@ -83,7 +74,6 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
var800aaa38[i].unk08 = 0;
var800aaa38[i].unk0c = 0;
osSyncPrintf("MUSIC(Play) : Done\n");
result = RESULT_OK_BREAK;
}
@ -98,7 +88,6 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
if ((var800aaa38[i].tracktype == TRACKTYPE_NONE || event->tracktype == var800aaa38[i].tracktype)
&& n_alCSPGetState(g_SeqInstances[i].seqp) != AL_STOPPED) {
index = i;
osSyncPrintf("MUSIC(Play) : About to dump the fading channel %d as a same state play request is waiting\n", index);
break;
}
}
@ -109,8 +98,6 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
if (var800aaa38[i].tracktype == TRACKTYPE_AMBIENT
&& n_alCSPGetState(g_SeqInstances[i].seqp) != AL_STOPPED) {
index = i;
osSyncPrintf("MUSIC(Play) : About to dump the ambience channel %d\n", index);
osSyncPrintf("MUSIC(Play) : Reason : A play request is waiting - State = %d\n", event->tracktype);
break;
}
}
@ -126,10 +113,8 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
var800aaa38[index].unk0c = 0;
} else {
event->failcount++;
osSyncPrintf("MUSIC(Play) : SERIOUS -> Out of MIDI channels - Attempt = %d\n", event->failcount);
if (event->failcount >= 6) {
osSyncPrintf("MUSIC(Play) : SERIOUS -> Tried %d times to play tune : Giving up\n", event->failcount);
result = RESULT_OK_BREAK;
}
}
@ -139,12 +124,6 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result)
return result;
}
const char var70053ee0[] = "MUSIC : Fading to pause\n";
const char var70053efc[] = "Music : Update Rate = %d";
const char var70053f18[] = "MUSIC TICK : Queue size = %d\n";
const char var70053f38[] = "MUSIC : Tick -> Channel %d (State=%d) has faded to stop : Dumping\n";
const char var70053f7c[] = "MUSIC : WARNING -> Force fade termination\n";
const char var70053fa8[] = "MUSIC TICK : Job Guid = %u\n";
s32 musicHandleStopEvent(struct musicevent *event, s32 result)
{

9
src/lib/snd.c
View File

@ -48,7 +48,6 @@ u32 g_SeqBufferSize;
ALIGNED16 struct sndcache g_SndCache;
const char g_SndGuardString[] = "RUSSES SOUND GUARD STRING";
const char var70053b3c[] = "Snd: SoundHeaderCacheInit\n";
bool g_SndDisabled = false;
u32 var8005dda4 = 0x00000000;
@ -1363,24 +1362,20 @@ void sndInit(void)
amgrCreate(&synconfig);
if (g_SndMp3Enabled) {
osSyncPrintf("RWI : Initialising the new and improved MP3 player\n");
mp3Init(&g_SndHeap);
func00037f08(0x7fff, 1);
func00037f5c(0, true);
osSyncPrintf("RWI : MP3 player Initialising Done\n");
}
for (i = 0; i < 3; i++) {
seqInit(&g_SeqInstances[i]);
}
osSyncPrintf("gsSndpNew\n");
n_alSndpNew(&sndpconfig);
osSyncPrintf("Set the sample callbacks\n");
sndpSetAddRefCallback(sndAddRef);
sndpSetRemoveRefCallback(sndRemoveRef);
@ -1887,10 +1882,6 @@ struct sndstate *sndStart(s32 arg0, s16 sound, struct sndstate **handle, s32 arg
return NULL;
}
const char var70053be0[] = "Snd_Play_Universal : Overriding -> Link = %d\n";
const char var70053c10[] = "Snd_Play_Mpeg : SYSTEM IS DISABLED\n";
const char var70053c34[] = "Snd_Play_Mpeg : Lib called -> Adr=%x\n";
const char var70053c5c[] = "Snd_Play_Mpeg : Chunk size -> Adr=%x\n";
void sndStartMp3(s16 soundnum, s32 arg1, s32 arg2, s32 arg3)
{