warning clean up
This commit is contained in:
parent
78202c25ce
commit
57993914c7
5 changed files with 15 additions and 12 deletions
|
|
@ -742,6 +742,7 @@ static headerstatus_e G_ReadDemoHeader(UINT8 *dp, demoheader_t *header)
|
|||
/* FALLTHRU */
|
||||
case 0x000D:
|
||||
dubs = false;
|
||||
/* FALLTHRU */
|
||||
case 0x000E:
|
||||
availabilities = false;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ extern "C"
|
|||
|
||||
// Store our last memory of the cluster player (because we're clearing it out for the second
|
||||
// cluster).
|
||||
static boolean clusterplayer_memory[MAXPLAYERS];
|
||||
//static boolean clusterplayer_memory[MAXPLAYERS];
|
||||
|
||||
// Filters players based on various factors, such as playercount and position.
|
||||
// fval = pingame
|
||||
|
|
@ -394,4 +394,4 @@ extern "C"
|
|||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include "doomtype.h"
|
||||
#include "doomstat.h"
|
||||
#include "hu_stuff.h"
|
||||
#include "k_items.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -92,7 +93,7 @@ typedef struct
|
|||
patch_t *K_getItemBoxPatch(boolean small, boolean dark);
|
||||
patch_t *K_getItemMulPatch(boolean small);
|
||||
patch_t *K_getItemAltPatch(boolean small, boolean multimode);
|
||||
boolean K_ShowAltItemIcon(UINT8 type, boolean small);
|
||||
boolean K_ShowAltItemIcon(kartitemtype_e type, boolean small);
|
||||
void K_getItemBoxDrawinfo(drawinfo_t *out);
|
||||
void K_getLapsDrawinfo(drawinfo_t *out);
|
||||
void K_getRingsDrawinfo(drawinfo_t *out);
|
||||
|
|
|
|||
17
src/m_cond.c
17
src/m_cond.c
|
|
@ -46,19 +46,20 @@ extraemblem_t extraemblems[MAXEXTRAEMBLEMS] =
|
|||
|
||||
// Unlockables
|
||||
// Default Unlockables
|
||||
// TODO: Softcode these or make new objectives even!
|
||||
unlockable_t unlockables[MAXUNLOCKABLES] =
|
||||
{
|
||||
// Name, Objective, Showing Conditionset, ConditionSet, Unlock Type, Variable, NoCecho, NoChecklist, Unlocked
|
||||
/* 01 */ {"Egg Cup", "", -1, 1, SECRET_NONE, 0, "", false, false, 0},
|
||||
/* 02 */ {"Chao Cup", "", -1, 2, SECRET_NONE, 0, "", false, false, 0},
|
||||
/* 03 */ {"SMK Cup", "", 2, 3, SECRET_NONE, 0, "", false, false, 0},
|
||||
/* 01 */ {"Egg Cup", "", -1, 1, SECRET_NONE, 0, NULL, false, false, 0},
|
||||
/* 02 */ {"Chao Cup", "", -1, 2, SECRET_NONE, 0, NULL, false, false, 0},
|
||||
/* 03 */ {"SMK Cup", "", 2, 3, SECRET_NONE, 0, NULL, false, false, 0},
|
||||
|
||||
/* 04 */ {"Hard Game Speed", "", -1, 4, SECRET_HARDSPEED, 0, "", false, false, 0},
|
||||
/* 05 */ {"Encore Mode", "", 4, 5, SECRET_ENCORE, 0, "", false, false, 0},
|
||||
/* 06 */ {"Hell Attack", "", 6, 6, SECRET_HELLATTACK, 0, "", false, false, 0},
|
||||
/* 04 */ {"Hard Game Speed", "", -1, 4, SECRET_HARDSPEED, 0, NULL, false, false, 0},
|
||||
/* 05 */ {"Encore Mode", "", 4, 5, SECRET_ENCORE, 0, NULL, false, false, 0},
|
||||
/* 06 */ {"Hell Attack", "", 6, 6, SECRET_HELLATTACK, 0, NULL, false, false, 0},
|
||||
|
||||
/* 07 */ {"Record Attack", "", -1, -1, SECRET_TIMEATTACK, 0, "" ,true, true, 0},
|
||||
/* 08 */ {"Capsule Attack", "", -1, -1, SECRET_ITEMBREAKER, 0, "", true, true, 0},
|
||||
/* 07 */ {"Record Attack", "", -1, -1, SECRET_TIMEATTACK, 0, NULL ,true, true, 0},
|
||||
/* 08 */ {"Capsule Attack", "", -1, -1, SECRET_ITEMBREAKER, 0, NULL, true, true, 0},
|
||||
};
|
||||
|
||||
// Number of emblems and extra emblems
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ strbuf_t *strbuf_alloc(void)
|
|||
// returns an offset to the newly appended string
|
||||
UINT32 strbuf_append(strbuf_t **strbuf, const char *str)
|
||||
{
|
||||
return strbuf_write(strbuf, (UINT8 *)str, strlen(str)+1);
|
||||
return strbuf_write(strbuf, (const UINT8 *)str, strlen(str)+1);
|
||||
}
|
||||
|
||||
// writes a raw block of bytes to the buffer
|
||||
|
|
|
|||
Loading…
Reference in a new issue