diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a9236fe..904bb595 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,6 +64,9 @@ jobs: id: cpu-cores if: matrix.target == 'qvm' + - uses: ammaraskar/gcc-problem-matcher@0.3.0 + if: matrix.target != 'qvm' + - name: Checkout q3lcc uses: actions/checkout@v4 with: @@ -91,6 +94,34 @@ jobs: qwprogs.* compression-level: 9 + verify-macos: + runs-on: macos-latest + timeout-minutes: 10 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - uses: ammaraskar/gcc-problem-matcher@0.3.0 + + - name: Build + run: | + cmake -B builddir -S . -G Xcode -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" + cmake --build builddir --config Release --parallel + + verify-msvc: + runs-on: windows-latest + timeout-minutes: 10 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - uses: ammaraskar/msvc-problem-matcher@0.3.0 + + - name: Build + run: | + cmake -B builddir -S . -G "Visual Studio 17 2022" + cmake --build builddir --config Release --parallel + upload: needs: build timeout-minutes: 10 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b4ed20a..ddbeb936 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.9.0) # Set project name and languge. project(qwprogs C) +include(CheckCCompilerFlag) + +set(CMAKE_COLOR_DIAGNOSTICS ON) + # CMake option for bot support, we check it below and add C preprocessor directive if required. option(BOT_SUPPORT "Build with bot support" ON) # Option for FTE extensions. We also have some basic support for FTE which does not controlled by this setting. @@ -152,6 +156,17 @@ if (CMAKE_C_COMPILER_ID STREQUAL "MSVC") target_compile_options(${PROJECT_NAME} PRIVATE /W4) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wall) + + check_c_compiler_flag("-Wstrict-prototypes" HAS_CFLAG_STRICT_PROTOTYPES) + if (HAS_CFLAG_STRICT_PROTOTYPES) + target_compile_options(${PROJECT_NAME} PRIVATE -Werror=strict-prototypes) + endif() + + check_c_compiler_flag("-Wstrlcpy-strlcat-size" HAS_STRLCPY_STRLCAT_SIZE) + if (HAS_STRLCPY_STRLCAT_SIZE) + target_compile_options(${PROJECT_NAME} PRIVATE -Werror=strlcpy-strlcat-size) + endif() + # Do not allow undefined symbols while linking. if(APPLE) target_link_options(${PROJECT_NAME} PRIVATE "-Wl,-undefined,error") diff --git a/include/g_local.h b/include/g_local.h index b14d2a86..8795f7f5 100644 --- a/include/g_local.h +++ b/include/g_local.h @@ -244,7 +244,7 @@ float g_random(void); float crandom(void); int i_rnd(int from, int to); float dist_random(float minValue, float maxValue, float spreadFactor); -float next_frame(); +float next_frame(void); gedict_t* spawn(void); void ent_remove(gedict_t *t); void soft_ent_remove(gedict_t *ent); @@ -299,7 +299,7 @@ void setsize(gedict_t *ed, float min_x, float min_y, float min_z, float max_x, f float max_z); void setmodel(gedict_t *ed, char *model); void sound(gedict_t *ed, int channel, char *samp, float vol, float att); -gedict_t* checkclient(); +gedict_t* checkclient(void); void traceline(float v1_x, float v1_y, float v1_z, float v2_x, float v2_y, float v2_z, int nomonst, gedict_t *ed); void TraceCapsule(float v1_x, float v1_y, float v1_z, float v2_x, float v2_y, float v2_z, @@ -370,19 +370,19 @@ char* armor_type(int items); qbool isghost(gedict_t *ed); -qbool isDuel(); -qbool isTeam(); -qbool isFFA(); -qbool isCTF(); -qbool isUnknown(); -int tp_num(); +qbool isDuel(void); +qbool isTeam(void); +qbool isFFA(void); +qbool isCTF(void); +qbool isUnknown(void); +int tp_num(void); int GetUserID(gedict_t *p); char* TrackWhom(gedict_t *p); int GetHandicap(gedict_t *p); qbool SetHandicap(gedict_t *p, int nhdc); void changelevel(const char *name); char* Get_PowerupsStr(void); -int Get_Powerups(); +int Get_Powerups(void); char* count_s(int cnt); char* Enables(float f); @@ -391,15 +391,15 @@ char* Allows(float f); char* Allowed(float f); char* OnOff(float f); -int get_scores1(); -int get_scores2(); -int get_scores3(); -gedict_t* get_ed_scores1(); -gedict_t* get_ed_scores2(); +int get_scores1(void); +int get_scores2(void); +int get_scores3(void); +gedict_t* get_ed_scores1(void); +gedict_t* get_ed_scores2(void); -gedict_t* get_ed_best1(); -gedict_t* get_ed_best2(); -gedict_t* get_ed_bestPow(); +gedict_t* get_ed_best1(void); +gedict_t* get_ed_best2(void); +gedict_t* get_ed_bestPow(void); char* str_noweapon(int k_disallow_weapons); @@ -408,12 +408,12 @@ void cvar_toggle_msg(gedict_t *p, char *cvarName, char *msg); qbool can_exec(char *name); void ghostClearScores(gedict_t *g); -void update_ghosts(); +void update_ghosts(void); // { events -void on_enter(); -void on_connect(); +void on_enter(void); +void on_connect(void); void on_match_start(gedict_t *p); void on_match_end(gedict_t *p); void on_match_break(gedict_t *p); @@ -426,7 +426,7 @@ void info_kf_update(gedict_t *p, char *from, char *to); // } void cl_refresh_plus_scores(gedict_t *p); -void refresh_plus_scores(); +void refresh_plus_scores(void); void disableupdates(gedict_t *ed, float time); @@ -434,13 +434,13 @@ int only_digits(const char *s); char* params_str(int from, int to); -char* SD_type_str(); // sudden death type string +char* SD_type_str(void); // sudden death type string char* respawn_model_name(int mdl_num); char* respawn_model_name_short(int mdl_num); -int get_fair_pack(); -int get_fallbunny(); +int get_fair_pack(void); +int get_fallbunny(void); void remove_projectiles(void); @@ -461,11 +461,11 @@ char* make_dots(char *dots, size_t dots_len, int cmd_max_len, char *cmd); // // subs.c -void SUB_CalcMove(vec3_t tdest, float tspeed, void (*func)()); -void SUB_CalcMoveEnt(gedict_t *ent, vec3_t tdest, float tspeed, void (*func)()); -void SUB_UseTargets(); -void SetMovedir(); -void InitTrigger(); +void SUB_CalcMove(vec3_t tdest, float tspeed, void (*func)(void)); +void SUB_CalcMoveEnt(gedict_t *ent, vec3_t tdest, float tspeed, void (*func)(void)); +void SUB_UseTargets(void); +void SetMovedir(void); +void InitTrigger(void); extern gedict_t *activator; // @@ -480,13 +480,13 @@ qbool G_SpawnString(const char *key, const char *defaultString, char **out); qbool G_SpawnFloat(const char *key, const char *defaultString, float *out); qbool G_SpawnInt(const char *key, const char *defaultString, int *out); qbool G_SpawnVector(const char *key, const char *defaultString, float *out); -void SUB_Remove(); +void SUB_Remove(void); void SUB_RM_01(gedict_t *ent); -void SUB_Null(); +void SUB_Null(void); //world.c void CopyToBodyQue(gedict_t *ent); -void ClearBodyQue(); +void ClearBodyQue(void); // client.c extern vec3_t VEC_ORIGIN; @@ -500,31 +500,31 @@ extern gedict_t *intermission_spot; extern int modelindex_eyes, modelindex_player; void set_nextmap(char *map); -void GotoNextMap(); +void GotoNextMap(void); qbool CheckRate(gedict_t *p, char *newrate); -int tiecount(); +int tiecount(void); void Check_SD(gedict_t *p); -void SetChangeParms(); -void SetNewParms(); -void ClientConnect(); +void SetChangeParms(void); +void SetNewParms(void); +void ClientConnect(void); void k_respawn(gedict_t *p, qbool body); void PutClientInServer(void); -void ClientDisconnect(); -void PlayerPreThink(); -void BothPostThink(); // <- called for player and spec -void PlayerPostThink(); -qbool PlayerCanPause(); -void SuperDamageSound(); +void ClientDisconnect(void); +void PlayerPreThink(void); +void BothPostThink(void); // <- called for player and spec +void PlayerPostThink(void); +qbool PlayerCanPause(gedict_t *p); +void SuperDamageSound(void); gedict_t* SelectSpawnPoint(char *spawnname); #define WP_STATS_UPDATE (0.3f) -void Print_Wp_Stats(); +void Print_Wp_Stats(void); #define SC_STATS_UPDATE (0.8f) -void Print_Scores(); +void Print_Scores(void); // { "new weapon stats" void WS_Mark(gedict_t *p, weaponName_t wp); @@ -533,21 +533,21 @@ void WS_OnSpecPovChange(gedict_t *s, qbool force); // } //spectate.c -void SpectatorConnect(); -void PutSpectatorInServer(); -void SpectatorDisconnect(); -void SpectatorThink(); +void SpectatorConnect(void); +void PutSpectatorInServer(void); +void SpectatorDisconnect(void); +void SpectatorThink(void); // weapons.c extern int impulse; -float W_BestWeapon(); -void W_Precache(); -void W_SetCurrentAmmo(); +float W_BestWeapon(void); +void W_Precache(void); +void W_SetCurrentAmmo(void); void SpawnBlood(vec3_t, float); void SpawnMeatSpray(vec3_t org, vec3_t vel); -void W_FireAxe(); +void W_FireAxe(void); void W_FireSpikes(float ox); -void W_FireLightning(); +void W_FireLightning(void); void LightningDamage(vec3_t p1, vec3_t p2, gedict_t *from, float damage); qbool W_CanSwitch(int wp, qbool warn); @@ -558,11 +558,11 @@ void launch_spike(vec3_t org, vec3_t dir); // match.c int WeirdCountPlayers(void); -float CountPlayers(); +float CountPlayers(void); float CountBots(void); -float CountRTeams(); +float CountRTeams(void); qbool isCanStart(gedict_t *s, qbool forceMembersWarn); -void StartTimer(); +void StartTimer(void); void StopTimer(int removeDemo); char* WpName(weaponName_t wp); @@ -584,10 +584,10 @@ void T_BeamDamage(gedict_t *attacker, float damage); //items.c void DropPowerup(float timeleft, int powerup); -void DropPowerups(); -void ShowSpawnPoints(); -void HideSpawnPoints(); -void DropBackpack(); +void DropPowerups(void); +void ShowSpawnPoints(void); +void HideSpawnPoints(void); +void DropBackpack(void); void adjust_pickup_time(float *current, float *total); @@ -607,9 +607,9 @@ void teleport_player(gedict_t *player, vec3_t origin, vec3_t angles, int flags); #define TELEDEATH(e) ((e)->deathtype == dtTELE1 || (e)->deathtype == dtTELE2 || (e)->deathtype == dtTELE3) // runes.c -void DropRune(); +void DropRune(void); void SpawnRunes(qbool yes); -void TossRune(); +void TossRune(void); void ResistanceSound(gedict_t *player); void HasteSound(gedict_t *player); void RegenerationSound(gedict_t *player); @@ -629,12 +629,12 @@ void log_close(void); extern fileHandle_t log_handle; // commands.c -void WillPause(); +void WillPause(void); typedef struct cmd_s { char *name; // funcref_t f; - void (*f)(); + void (*f)(void); float arg; int cf_flags; const char *description; @@ -724,8 +724,8 @@ const char *um_name_byidx(UserModes_t idx); // { spec more info -qbool mi_on(); -qbool mi_adm_only(); +qbool mi_on(void); +qbool mi_adm_only(void); void mi_print(gedict_t *tooker, int it, char *msg); void info_mi_update(gedict_t *p, char *from, char *to); @@ -776,12 +776,12 @@ typedef struct rpickupTeams_s } rpickupTeams_t; extern votemap_t maps_voted[]; -int vote_get_maps(); +int vote_get_maps(void); qbool is_elected(gedict_t *p, electType_t et); -int get_elect_type(); -char* get_elect_type_str(); +int get_elect_type(void); +char* get_elect_type_str(void); void vote_clear(int fofs); int get_votes_req(int fofs, qbool diff); @@ -789,12 +789,12 @@ int get_votes(int fofs); int get_votes_by_value(int fofs, int value); int is_admins_vote(int fofs); -void vote_check_map(); -void vote_check_break(); -void vote_check_elect(); -void vote_check_pickup(); +void vote_check_map(void); +void vote_check_break(void); +void vote_check_elect(void); +void vote_check_pickup(void); void vote_check_rpickup(int maxRecursion); -void vote_check_swapall(); +void vote_check_swapall(void); void vote_check_all(void); #define VOTE_FOFS(x) ((intptr_t)&(((vote_t *)0)->x)) @@ -818,8 +818,8 @@ void vote_check_all(void); #define MAX_RPICKUP_RECUSION 3 #define MAX_PAUSE_REQUESTS 3 -void ElectThink(); -void AbortElect(); +void ElectThink(void); +void AbortElect(void); // admin.c @@ -830,46 +830,46 @@ void AbortElect(); qbool is_real_adm(gedict_t *p); // is pass/vip granted admin (real admin in terms of ktpro) qbool is_adm(gedict_t *p); // is elected admin (admin rigths granted by /elect command) -void KickThink(); +void KickThink(void); void ExitKick(gedict_t *kicker); void BecomeAdmin(gedict_t *p, int adm_flags); -void VoteAdmin(); +void VoteAdmin(void); void PlayerStopFire(gedict_t *p); void do_force_spec(gedict_t *p, gedict_t *admin, qbool spec); // arena.c -void ra_init_que(); -gedict_t* ra_que_first(); +void ra_init_que(void); +gedict_t* ra_que_first(void); void ra_in_que(gedict_t *p); void ra_out_que(gedict_t *p); qbool ra_isin_que(gedict_t *p); int ra_pos_que(gedict_t *p); -qbool isRA(); // not game mode, but just modificator of duel +qbool isRA(void); // not game mode, but just modificator of duel qbool isWinner(gedict_t *p); qbool isLoser(gedict_t *p); -gedict_t* getWinner(); -gedict_t* getLoser(); -void ra_ClientDisconnect(); +gedict_t* getWinner(void); +gedict_t* getLoser(void); +void ra_ClientDisconnect(void); void ra_ClientObituary(gedict_t *targ, gedict_t *attacker); -void ra_PutClientInServer(); -void RocketArenaPre(); -qbool readytostart(); -void ra_Frame(); +void ra_PutClientInServer(void); +void RocketArenaPre(void); +qbool readytostart(void); +void ra_Frame(void); void setfullwep(gedict_t *anent); void setnowep(gedict_t *anent); // { ra commands -void ra_PlayerStats(); -void ra_PrintPos(); -void ra_break(); +void ra_PlayerStats(void); +void ra_PrintPos(void); +void ra_break(void); // } // clan_arena.c -qbool isCA(); +qbool isCA(void); qbool CA_CheckAlive(gedict_t *p); int CA_wins_required(void); int CA_count_ready_players(void); @@ -894,7 +894,7 @@ int capt_num(gedict_t *p); int coach_num(gedict_t *p); qbool is_coach(gedict_t *p); -void ExitCoach(); +void ExitCoach(void); // maps.c @@ -905,8 +905,8 @@ void GetMapList(void); char* GetMapName(int imp); int GetMapNum(char *mapname); void DoSelectMap(int iMap); -void SelectMap(); -void VoteMap(); +void SelectMap(void); +void VoteMap(void); qbool VoteMapSpecific(char *map); // match.c @@ -915,8 +915,8 @@ void EndMatch(float skip_log); void StatsToFile(void); // grapple.c -void GrappleThrow(); -void GrappleService(); +void GrappleThrow(void); +void GrappleService(void); void GrappleReset(gedict_t *rhook); void CancelHook(gedict_t *owner); float IncreasePullSpeed(float speed, float incr); @@ -978,7 +978,7 @@ qbool isRACE(void); void apply_race_settings(void); void ToggleRace(void); void RaceCountdownChange(float t); -void StartDemoRecord(); +void StartDemoRecord(void); qbool race_weapon_allowed(gedict_t *p); @@ -1104,58 +1104,58 @@ extern int sv_minping; // used to broadcast changes // ANIM() macro idea I got from Tonik #define ANIM(name, _frame, _next) \ -void name () { \ +void name (void) { \ self->s.v.frame = _frame; \ self->s.v.nextthink = g_globalvars.time + FRAMETIME; \ self->think = ( func_t ) _next; } // sp_client.c -void ExitIntermission(); +void ExitIntermission(void); char* ObituaryForMonster(char *attacker_class); // sp_dog.c -float DogCheckAttack(); +float DogCheckAttack(void); // sp_demon.c -float DemonCheckAttack(); +float DemonCheckAttack(void); // sp_ogre.c -float OgreCheckAttack(); +float OgreCheckAttack(void); // sp_shambler.c -float ShamCheckAttack(); +float ShamCheckAttack(void); // sp_soldier.c -float SoldierCheckAttack(); +float SoldierCheckAttack(void); // sp_wizard.c -float WizardCheckAttack(); +float WizardCheckAttack(void); // sp_ai.c // FIXME: make them static or get rid of globals... extern float enemy_vis, enemy_infront, enemy_range; extern float enemy_yaw; -void FoundTarget(); +void FoundTarget(void); void GetMadAtAttacker(gedict_t *attacker); void SUB_AttackFinished(float normal); void SUB_CheckRefire(func_t thinkst); -void ai_stand(); +void ai_stand(void); void ai_walk(float dist); void ai_run(float dist); void ai_pain(float dist); -void ai_face(); +void ai_face(void); void ai_charge(float d); -void ai_charge_side(); +void ai_charge_side(void); void ai_forward(float dist); void ai_back(float dist); -void ai_turn(); +void ai_turn(void); void ai_painforward(float dist); -void ai_melee(); -void ai_melee_side(); +void ai_melee(void); +void ai_melee_side(void); // sp_monsters.c typedef struct bloodfest_s @@ -1170,7 +1170,7 @@ extern bloodfest_t g_bloodfest; // reset bloodfest runtime variables to default values. void bloodfest_reset(void); -void monster_death_use(); +void monster_death_use(void); void check_monsters_respawn(void); @@ -1187,7 +1187,7 @@ void LaunchLaser(vec3_t org, vec3_t vec); #define K_ENTITYFILE_SEPARATOR '#' // bots -qbool bots_enabled(); +qbool bots_enabled(void); // files fileHandle_t std_fropen(const char *fmt, ...) PRINTF_FUNC(1); diff --git a/include/g_syscalls.h b/include/g_syscalls.h index 340f83ca..cbda3d3b 100644 --- a/include/g_syscalls.h +++ b/include/g_syscalls.h @@ -23,7 +23,7 @@ * $Id$ */ -intptr_t trap_GetApiVersion(); +intptr_t trap_GetApiVersion(void); qbool trap_GetEntityToken(char *token, intptr_t size); void trap_DPrintf(const char *fmt); void trap_conprint(const char *fmt); @@ -39,7 +39,7 @@ void trap_BPrint(intptr_t level, const char *fmt, intptr_t flags); void trap_SPrint(intptr_t edn, intptr_t level, const char *fmt, intptr_t flags); void trap_CenterPrint(intptr_t edn, const char *fmt); void trap_Error(const char *fmt); -intptr_t trap_spawn(); +intptr_t trap_spawn(void); void trap_remove(intptr_t edn); void trap_precache_sound(char *name); void trap_precache_model(char *name); @@ -50,7 +50,7 @@ void trap_setsize(intptr_t edn, float min_x, float min_y, float min_z, float max void trap_setmodel(intptr_t edn, char *model); void trap_ambientsound(float pos_x, float pos_y, float pos_z, char *samp, float vol, float atten); void trap_sound(intptr_t edn, intptr_t channel, char *samp, float vol, float att); -intptr_t trap_checkclient(); +intptr_t trap_checkclient(void); void trap_traceline(float v1_x, float v1_y, float v1_z, float v2_x, float v2_y, float v2_z, intptr_t nomonst, intptr_t edn); @@ -58,7 +58,7 @@ void trap_traceline(float v1_x, float v1_y, float v1_z, float v2_x, float v2_y, #define STUFFCMD_DEMOONLY ( 1<<1) // put in mvd demo only void trap_stuffcmd(intptr_t edn, const char *fmt, intptr_t flags); void trap_localcmd(const char *fmt); -void trap_executecmd(); +void trap_executecmd(void); void trap_readcmd(const char *str, char *buf, intptr_t size); void trap_redirectcmd(gedict_t *ent, char *str); @@ -91,9 +91,9 @@ void trap_WriteAngle(intptr_t to, float data); void trap_WriteCoord(intptr_t to, float data); void trap_WriteString(intptr_t to, char *data); void trap_WriteEntity(intptr_t to, intptr_t edn); -void trap_FlushSignon(); +void trap_FlushSignon(void); void trap_disableupdates(intptr_t edn, float time); -intptr_t trap_CmdArgc(); +intptr_t trap_CmdArgc(void); void trap_CmdArgv(intptr_t arg, char *valbuff, intptr_t sizebuff); void trap_CmdArgs(char *valbuff, intptr_t sizebuff); void trap_CmdTokenize(char *str); diff --git a/include/player.h b/include/player.h index 5a699308..ac6f9dbf 100644 --- a/include/player.h +++ b/include/player.h @@ -23,124 +23,124 @@ * $Id$ */ -void player_stand1(); -void player_run(); -void player_shot1(); -void player_shot2(); -void player_shot3(); -void player_shot4(); -void player_shot5(); -void player_shot6(); -void player_axe1(); -void player_axe2(); -void player_axe3(); -void player_axe4(); -void player_axeb1(); -void player_axeb2(); -void player_axeb3(); -void player_axeb4(); -void player_axec1(); -void player_axec2(); -void player_axec3(); -void player_axec4(); -void player_axed1(); -void player_axed2(); -void player_axed3(); -void player_axed4(); -void player_chain1(); -void player_chain2(); -void player_chain3(); -void player_chain4(); -void player_chain5(); -void player_nail1(); -void player_nail2(); -void player_light1(); -void player_light2(); -void player_rocket1(); -void player_rocket2(); -void player_rocket3(); -void player_rocket4(); -void player_rocket5(); -void player_rocket6(); -void player_pain1(); -void player_pain2(); -void player_pain3(); -void player_pain4(); -void player_pain5(); -void player_pain6(); -void player_axpain1(); -void player_axpain2(); -void player_axpain3(); -void player_axpain4(); -void player_axpain5(); -void player_axpain6(); +void player_stand1(void); +void player_run(void); +void player_shot1(void); +void player_shot2(void); +void player_shot3(void); +void player_shot4(void); +void player_shot5(void); +void player_shot6(void); +void player_axe1(void); +void player_axe2(void); +void player_axe3(void); +void player_axe4(void); +void player_axeb1(void); +void player_axeb2(void); +void player_axeb3(void); +void player_axeb4(void); +void player_axec1(void); +void player_axec2(void); +void player_axec3(void); +void player_axec4(void); +void player_axed1(void); +void player_axed2(void); +void player_axed3(void); +void player_axed4(void); +void player_chain1(void); +void player_chain2(void); +void player_chain3(void); +void player_chain4(void); +void player_chain5(void); +void player_nail1(void); +void player_nail2(void); +void player_light1(void); +void player_light2(void); +void player_rocket1(void); +void player_rocket2(void); +void player_rocket3(void); +void player_rocket4(void); +void player_rocket5(void); +void player_rocket6(void); +void player_pain1(void); +void player_pain2(void); +void player_pain3(void); +void player_pain4(void); +void player_pain5(void); +void player_pain6(void); +void player_axpain1(void); +void player_axpain2(void); +void player_axpain3(void); +void player_axpain4(void); +void player_axpain5(void); +void player_axpain6(void); void player_pain(struct gedict_s *attacker, float take); -void player_diea1(); -void player_diea2(); -void player_diea3(); -void player_diea4(); -void player_diea5(); -void player_diea6(); -void player_diea7(); -void player_diea8(); -void player_diea9(); -void player_diea10(); -void player_diea11(); -void player_dieb1(); -void player_dieb2(); -void player_dieb3(); -void player_dieb4(); -void player_dieb5(); -void player_dieb6(); -void player_dieb7(); -void player_dieb8(); -void player_dieb9(); -void player_diec1(); -void player_diec2(); -void player_diec3(); -void player_diec4(); -void player_diec5(); -void player_diec6(); -void player_diec7(); -void player_diec8(); -void player_diec9(); -void player_diec10(); -void player_diec11(); -void player_diec12(); -void player_diec13(); -void player_diec14(); -void player_diec15(); -void player_died1(); -void player_died2(); -void player_died3(); -void player_died4(); -void player_died5(); -void player_died6(); -void player_died7(); -void player_died8(); -void player_died9(); -void player_diee1(); -void player_diee2(); -void player_diee3(); -void player_diee4(); -void player_diee5(); -void player_diee6(); -void player_diee7(); -void player_diee8(); -void player_diee9(); -void player_die_ax1(); -void player_die_ax2(); -void player_die_ax3(); -void player_die_ax4(); -void player_die_ax5(); -void player_die_ax6(); -void player_die_ax7(); -void player_die_ax8(); -void player_die_ax9(); -void PlayerDead(); -void PlayerDie(); +void player_diea1(void); +void player_diea2(void); +void player_diea3(void); +void player_diea4(void); +void player_diea5(void); +void player_diea6(void); +void player_diea7(void); +void player_diea8(void); +void player_diea9(void); +void player_diea10(void); +void player_diea11(void); +void player_dieb1(void); +void player_dieb2(void); +void player_dieb3(void); +void player_dieb4(void); +void player_dieb5(void); +void player_dieb6(void); +void player_dieb7(void); +void player_dieb8(void); +void player_dieb9(void); +void player_diec1(void); +void player_diec2(void); +void player_diec3(void); +void player_diec4(void); +void player_diec5(void); +void player_diec6(void); +void player_diec7(void); +void player_diec8(void); +void player_diec9(void); +void player_diec10(void); +void player_diec11(void); +void player_diec12(void); +void player_diec13(void); +void player_diec14(void); +void player_diec15(void); +void player_died1(void); +void player_died2(void); +void player_died3(void); +void player_died4(void); +void player_died5(void); +void player_died6(void); +void player_died7(void); +void player_died8(void); +void player_died9(void); +void player_diee1(void); +void player_diee2(void); +void player_diee3(void); +void player_diee4(void); +void player_diee5(void); +void player_diee6(void); +void player_diee7(void); +void player_diee8(void); +void player_diee9(void); +void player_die_ax1(void); +void player_die_ax2(void); +void player_die_ax3(void); +void player_die_ax4(void); +void player_die_ax5(void); +void player_die_ax6(void); +void player_die_ax7(void); +void player_die_ax8(void); +void player_die_ax9(void); +void PlayerDead(void); +void PlayerDie(void); gedict_t* ThrowGib(char *gibname, float dm); void ThrowHead(char *gibname, float dm); -void muzzleflash(); +void muzzleflash(void); diff --git a/include/progs.h b/include/progs.h index 3f2e22dd..d3b297c0 100644 --- a/include/progs.h +++ b/include/progs.h @@ -39,11 +39,11 @@ typedef struct shared_edict_s } edict_t; struct gedict_s; -typedef void (*th_die_funcref_t)(); +typedef void (*th_die_funcref_t)(void); typedef void (*th_pain_funcref_t)(struct gedict_s*, float); // { SP -typedef void (*th_sp_funcref_t)(); +typedef void (*th_sp_funcref_t)(void); // } typedef enum @@ -822,7 +822,7 @@ typedef struct gedict_s // float cnt; // misc flag - void (*think1)(); //calcmove + void (*think1)(void); //calcmove vec3_t finaldest; //combat float dmg; diff --git a/src/admin.c b/src/admin.c index af874201..3977a075 100644 --- a/src/admin.c +++ b/src/admin.c @@ -1,9 +1,9 @@ // admin.c #include "g_local.h" -void AdminMatchStart(); +void AdminMatchStart(void); void PlayerReady(qbool startIdlebot); -void NextClient(); +void NextClient(void); qbool DoKick(gedict_t *victim, gedict_t *kicker); // is real admin @@ -18,7 +18,7 @@ qbool is_adm(gedict_t *p) return (is_real_adm(p) || (p->k_admin & AF_ADMIN)); } -void KickThink() +void KickThink(void) { if (!self->k_kicking) { @@ -116,7 +116,7 @@ qbool DoKick(gedict_t *victim, gedict_t *kicker) return true; } -void AdminKick() +void AdminKick(void) { int argc = trap_CmdArgc(); @@ -171,7 +171,7 @@ void AdminKick() } // multi kick -void m_kick() +void m_kick(void) { int i, k; gedict_t *p; @@ -228,7 +228,7 @@ void m_kick() } } -void NextClient() +void NextClient(void) { int from = 0; @@ -261,7 +261,7 @@ void NextClient() getname(self->k_playertokick)); } -void YesKick() +void YesKick(void) { if (!self->k_kicking) { @@ -283,7 +283,7 @@ void YesKick() NextClient(); } -void DontKick() +void DontKick(void) { if (!self->k_kicking) { @@ -310,7 +310,7 @@ void BecomeAdmin(gedict_t *p, int adm_flags) // "admin" command -void ReqAdmin() +void ReqAdmin(void) { // check for election if (is_elected(self, etAdmin)) @@ -393,7 +393,7 @@ void ReqAdmin() G_sprint(self, 2, "Use %s or %s to enter code\n", redtext("numbers"), redtext("impulses")); } -void AdminImpBot() +void AdminImpBot(void) { float coef, i1; @@ -447,7 +447,7 @@ void AdminImpBot() } // "ellect" command -void VoteAdmin() +void VoteAdmin(void) { gedict_t *p; int till; @@ -536,7 +536,7 @@ void VoteAdmin() electguard->s.v.nextthink = g_globalvars.time + 60; } -void AdminMatchStart() +void AdminMatchStart(void) { gedict_t *p; int i = 0; @@ -569,7 +569,7 @@ void AdminMatchStart() } } -void ReadyThink() +void ReadyThink(void) { float i1; char *txt, *gr; @@ -639,7 +639,7 @@ void ReadyThink() self->s.v.nextthink = g_globalvars.time + 1; } -void AdminForceStart() +void AdminForceStart(void) { gedict_t *mess; @@ -705,7 +705,7 @@ void AdminForceStart() } } -void AdminForceBreak() +void AdminForceBreak(void) { if (is_adm(self) && (self->ct != ctPlayer) && !match_in_progress) { @@ -739,7 +739,7 @@ void AdminForceBreak() EndMatch(0); } -void AdminForceMap() +void AdminForceMap(void) { char map[128]; @@ -780,7 +780,7 @@ void PlayerStopFire(gedict_t *p) p->wreg_attack = 0; } -void PlayersStopFire() +void PlayersStopFire(void) { gedict_t *p; @@ -790,7 +790,7 @@ void PlayersStopFire() } } -void TogglePreWar() +void TogglePreWar(void) { int k_prewar = bound(0, cvar("k_prewar"), 2); @@ -846,7 +846,7 @@ void TogglePreWar() cvar_fset("k_prewar", k_prewar); } -void ToggleMapLock() +void ToggleMapLock(void) { float tmp; @@ -885,7 +885,7 @@ void ToggleMapLock() } } -void ToggleFallBunny() +void ToggleFallBunny(void) { if (match_in_progress) { @@ -909,7 +909,7 @@ void ToggleFallBunny() cvar_toggle_msg(self, "k_fallbunny", redtext("fallbunny")); } -void sv_lock() +void sv_lock(void) { int lock_time = 15; @@ -971,7 +971,7 @@ void do_force_spec(gedict_t *p, gedict_t *admin, qbool spec) } // ktpro (c) -void force_spec() +void force_spec(void) { qbool found = false; gedict_t *p = NULL; diff --git a/src/arena.c b/src/arena.c index 8f8a65c4..67a1de02 100644 --- a/src/arena.c +++ b/src/arena.c @@ -15,13 +15,13 @@ void SetNone(gedict_t *p); gedict_t *ra_que[MAX_CLIENTS]; -void ra_init_que() +void ra_init_que(void) { memset(ra_que, 0, sizeof(ra_que)); } // return first element in ra queue, return NULL if queue empty -gedict_t* ra_que_first() +gedict_t* ra_que_first(void) { return ra_que[0]; } @@ -127,7 +127,7 @@ int ra_pos_que(gedict_t *p) } // ra is just modificator of duel -qbool isRA() +qbool isRA(void) { return (isDuel() && cvar("k_rocketarena")); } @@ -142,7 +142,7 @@ qbool isLoser(gedict_t *p) return (p->ra_pt == raLoser); } -gedict_t* getWinner() +gedict_t* getWinner(void) { gedict_t *p; @@ -157,7 +157,7 @@ gedict_t* getWinner() return NULL; } -gedict_t* getLoser() +gedict_t* getLoser(void) { gedict_t *p; @@ -187,7 +187,7 @@ void SetNone(gedict_t *p) p->ra_pt = raNone; } -void ra_ClientDisconnect() +void ra_ClientDisconnect(void) { gedict_t *p = NULL; @@ -351,7 +351,7 @@ void ra_ClientObituary(gedict_t *targ, gedict_t *attacker) } } -void ra_PutClientInServer() +void ra_PutClientInServer(void) { if (!isRA()) { @@ -464,7 +464,7 @@ void setfullwep(gedict_t *anent) self = swap; } -qbool readytostart() +qbool readytostart(void) { if (!isRA()) { @@ -535,7 +535,7 @@ void PrintStats(gedict_t *who) who->laststattime = g_globalvars.time + PLAYERSTATTIME; } -void ra_Frame() +void ra_Frame(void) { static int last_r; int r; @@ -644,7 +644,7 @@ void ra_Frame() } } -void RocketArenaPre() +void RocketArenaPre(void) { if (!isRA()) { @@ -703,7 +703,7 @@ void RocketArenaPre() // { ra commands -void ra_PlayerStats() +void ra_PlayerStats(void) { gedict_t *p; int i, pL = 0; @@ -768,7 +768,7 @@ void ra_PlayerStats() } } -void ra_PrintPos() +void ra_PrintPos(void) { int pos; @@ -808,7 +808,7 @@ void ra_PrintPos() } } -void ra_break() +void ra_break(void) { if (!isRA() || isWinner(self) || isLoser(self)) { diff --git a/src/bot_botgoals.c b/src/bot_botgoals.c index 8028c257..541191f7 100644 --- a/src/bot_botgoals.c +++ b/src/bot_botgoals.c @@ -23,7 +23,7 @@ qbool POVDMM4DontWalkThroughDoor(gedict_t *goal_entity); qbool DM6DoorLogic(gedict_t *self, gedict_t *goal_entity); void SUB_regen(void); -void SUB_regen_powerups(); +void SUB_regen_powerups(void); qbool WaitingToRespawn(gedict_t *ent) { diff --git a/src/bot_bothazd.c b/src/bot_bothazd.c index 0b92d07c..aaac3be7 100644 --- a/src/bot_bothazd.c +++ b/src/bot_bothazd.c @@ -198,7 +198,7 @@ static void GrenadeAlert(void) ExplodeAlert(self->s.v.origin, self->s.v.nextthink); } -static void Missile_Remove() +static void Missile_Remove(void) { self->s.v.owner = NUM_FOR_EDICT(world); ent_remove(self); diff --git a/src/bot_bothelp.c b/src/bot_bothelp.c index 35ab934b..62a529ae 100644 --- a/src/bot_bothelp.c +++ b/src/bot_bothelp.c @@ -88,7 +88,7 @@ qbool VisibleEntity(gedict_t *ent) return PointVisible(vec); } -gedict_t* HelpTeammate() +gedict_t* HelpTeammate(void) { gedict_t *goalent; gedict_t *head, *selected1, *selected2; diff --git a/src/bot_botjump.c b/src/bot_botjump.c index c431a52d..4adc8217 100644 --- a/src/bot_botjump.c +++ b/src/bot_botjump.c @@ -12,7 +12,7 @@ #include "g_local.h" -void DemoMark(); +void DemoMark(void); #define FB_LAVAJUMP_NOT 0 // not lava-jumping #define FB_LAVAJUMP_SINK 1 // deliberately sinking, waiting for waterlevel == 3 diff --git a/src/bot_botpath.c b/src/bot_botpath.c index 6e514d9f..6933ad5b 100644 --- a/src/bot_botpath.c +++ b/src/bot_botpath.c @@ -12,9 +12,9 @@ #include "g_local.h" -void DM3CampLogic(); -void DM4CampLogic(); -void DM6CampLogic(); +void DM3CampLogic(void); +void DM4CampLogic(void); +void DM6CampLogic(void); void DM6MarkerTouchLogic(gedict_t *self, gedict_t *goalentity_marker); qbool DM6LookAtDoor(gedict_t *self); diff --git a/src/bot_botphys.c b/src/bot_botphys.c index 97458cdd..25905d01 100644 --- a/src/bot_botphys.c +++ b/src/bot_botphys.c @@ -98,7 +98,7 @@ void BotDetectTrapped(gedict_t *self) } } -void FrogbotPrePhysics2() +void FrogbotPrePhysics2(void) { no_bots_stuck = true; diff --git a/src/bot_botthink.c b/src/bot_botthink.c index fc0fd786..8f9adefb 100644 --- a/src/bot_botthink.c +++ b/src/bot_botthink.c @@ -71,7 +71,7 @@ static void LookingAtEnemyLogic(gedict_t *self) } } -static void NewlyPickedEnemyLogic() +static void NewlyPickedEnemyLogic(void) { gedict_t *goalentity_ = &g_edicts[self->s.v.goalentity]; gedict_t *enemy_ = &g_edicts[self->s.v.enemy]; @@ -272,7 +272,7 @@ static void BotMoveTowardsLinkedMarker(gedict_t *self, vec3_t dir_move) } // Called when the bot has a touch marker set -static void BotTouchMarkerLogic() +static void BotTouchMarkerLogic(void) { TargetEnemyLogic(self); diff --git a/src/bot_commands.c b/src/bot_commands.c index 74643270..9cb43dbf 100644 --- a/src/bot_commands.c +++ b/src/bot_commands.c @@ -201,7 +201,7 @@ void FrogbotListPaths(void) G_sprint(self, PRINT_HIGH, "%3d paths found matching %s\n", path_count, argument); } -static void BuildTeamList() +static void BuildTeamList(void) { int foundTeams = 0; diff --git a/src/bot_load.c b/src/bot_load.c index 27aac1cd..6c75e520 100644 --- a/src/bot_load.c +++ b/src/bot_load.c @@ -4,11 +4,11 @@ #if 0 -void a_think() +void a_think(void) { } -void spawn_load() +void spawn_load(void) { load_position = dropper; while (load_position) @@ -35,7 +35,7 @@ void spawn_load() ++total_entity_count; } } -void set_load() +void set_load(void) { load_position = current_load_position; while (load_position) @@ -45,7 +45,7 @@ void set_load() } } -void remove_load() +void remove_load(void) { gedict_t *marker_; diff --git a/src/bot_loadmap.c b/src/bot_loadmap.c index 7082bd03..477dbe1a 100644 --- a/src/bot_loadmap.c +++ b/src/bot_loadmap.c @@ -29,7 +29,7 @@ typedef struct fb_mapping_s fb_spawn_t* ItemSpawnFunction(int i); -void InvalidMap() +void InvalidMap(void) { G_sprint(self, 2, "This map does not have bot-support.\n"); } @@ -226,7 +226,7 @@ static qbool ProcessedItem(gedict_t *item) return (item->fb.fl_marker || item->fb.index); } -static void CreateItemMarkers() +static void CreateItemMarkers(void) { // Old frogbot method was to call during item spawns, we just // catch up afterwards once we know the map is valid diff --git a/src/bot_match.c b/src/bot_match.c index 0b4d3ece..94836b04 100644 --- a/src/bot_match.c +++ b/src/bot_match.c @@ -10,11 +10,11 @@ #include "g_local.h" -void button_use(); +void button_use(void); void fd_secret_use(gedict_t *attacked, float take); -void door_use(); -void door_killed(); -void multi_use(); +void door_use(void); +void door_killed(void); +void multi_use(void); // Can also be called via "botcmd debug startmap" void BotsFireInitialTriggers(gedict_t *player) @@ -57,11 +57,11 @@ void BotsFireInitialTriggers(gedict_t *player) self = ent; if (ent->s.v.takedamage) { - ((void (*)())(ent->th_pain))(); + ((void (*)(void))(ent->th_pain))(); } else if (ent->use) { - ((void (*)())(ent->use))(); + ((void (*)(void))(ent->use))(); } } } diff --git a/src/buttons.c b/src/buttons.c index 06832390..c7f728c6 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -24,10 +24,10 @@ */ #include "g_local.h" -void button_wait(); -void button_return(); +void button_wait(void); +void button_return(void); -void button_wait() +void button_wait(void) { self->state = STATE_TOP; self->s.v.nextthink = self->s.v.ltime + self->wait; @@ -39,12 +39,12 @@ void button_wait() self->s.v.frame = 1; // use alternate textures } -void button_done() +void button_done(void) { self->state = STATE_BOTTOM; } -void button_return() +void button_return(void) { self->state = STATE_DOWN; @@ -58,11 +58,11 @@ void button_return() } } -void button_blocked() +void button_blocked(void) { // do nothing, just don't ome all the way back out } -void button_fire() +void button_fire(void) { if (!k_practice) // #practice mode# { @@ -84,7 +84,7 @@ void button_fire() SUB_CalcMove(self->pos2, self->speed, button_wait); } -void button_use() +void button_use(void) { // #practice mode# if (!k_practice && (match_in_progress != 2)) @@ -96,7 +96,7 @@ void button_use() button_fire(); } -void button_touch() +void button_touch(void) { // #practice mode# if (!k_practice && (match_in_progress != 2)) @@ -114,7 +114,7 @@ void button_touch() button_fire(); } -void button_killed() +void button_killed(void) { if (!k_practice && (match_in_progress != 2)) { @@ -148,7 +148,7 @@ void button_killed() 2) metallic click 3) in-out */ -void SP_func_button() +void SP_func_button(void) { float ftemp; diff --git a/src/captain.c b/src/captain.c index 0dc496bf..69f3b6c7 100644 --- a/src/captain.c +++ b/src/captain.c @@ -30,7 +30,7 @@ static int turn_number; -void CancelCaptains(); +void CancelCaptains(void); int capt_num(gedict_t *p) { @@ -70,7 +70,7 @@ void SetPlayerParams(gedict_t *p, gedict_t *cap) p->k_picked = capt_num(cap); } -void PrintCaptainInTurn() +void PrintCaptainInTurn(void) { gedict_t *p; @@ -90,7 +90,7 @@ void PrintCaptainInTurn() } } -void CancelCaptains() +void CancelCaptains(void) { gedict_t *p; @@ -112,7 +112,7 @@ void CancelCaptains() } } -void CheckFinishCaptain() +void CheckFinishCaptain(void) { int pl_free = 0; gedict_t *p, *lastone = NULL; @@ -153,7 +153,7 @@ void CheckFinishCaptain() } } -void CaptainPickPlayer() +void CaptainPickPlayer(void) { gedict_t *p; @@ -186,7 +186,7 @@ void CaptainPickPlayer() } } -void ExitCaptain() +void ExitCaptain(void) { gedict_t *p; @@ -215,7 +215,7 @@ void ExitCaptain() G_bprint(2, "%s captain present\n", (floor(k_captains) ? "\x90\x31\x91" : redtext("No"))); } -void VoteCaptain() +void VoteCaptain(void) { int till; gedict_t *p, *electguard; @@ -357,7 +357,7 @@ void VoteCaptain() electguard->s.v.nextthink = g_globalvars.time + 60; } -void BeginPicking() +void BeginPicking(void) { gedict_t *p; int num; diff --git a/src/clan_arena.c b/src/clan_arena.c index 23f860b8..873b8eeb 100644 --- a/src/clan_arena.c +++ b/src/clan_arena.c @@ -242,7 +242,7 @@ int CA_wins_required(void) return ((k_clan_arena_rounds + 1) / 2); } -qbool isCA() +qbool isCA(void) { return (isTeam() && cvar("k_clan_arena")); } diff --git a/src/client.c b/src/client.c index e55c99bd..21747c89 100644 --- a/src/client.c +++ b/src/client.c @@ -43,23 +43,23 @@ vec3_t VEC_HULL2_MAX = int modelindex_eyes, modelindex_player, vwep_index; qbool can_prewar(qbool fire); -void IdlebotCheck(); -void CheckAll(); -void PlayerStats(); -void ExitCaptain(); -void CheckFinishCaptain(); -void MakeMOTD(); -void ImpulseCommands(); -void StartDie(); -void ZeroFpsStats(); -void item_megahealth_rot(); +void IdlebotCheck(void); +void CheckAll(void); +void PlayerStats(void); +void ExitCaptain(void); +void CheckFinishCaptain(void); +void MakeMOTD(void); +void ImpulseCommands(void); +void StartDie(void); +void ZeroFpsStats(void); +void item_megahealth_rot(void); void del_from_specs_favourites(gedict_t *rm); void item_megahealth_rot(void); extern int g_matchstarttime; -void CheckAll() +void CheckAll(void) { static float next_check = -1; gedict_t *p; @@ -124,7 +124,7 @@ qbool CheckRate(gedict_t *p, char *newrate) #define TA_ALL ( TA_INFO | TA_GLOW | TA_INVINCIBLE ) // check if client lagged or returned from lag -void CheckTiming() +void CheckTiming(void) { float timing_players_time = bound(0, cvar("timing_players_time"), 30); int timing_players_action = TA_ALL & (int)cvar("timing_players_action"); @@ -215,7 +215,7 @@ void set_nextmap(char *map) This is the camera point for the intermission. Use mangle instead of angle, so you can set pitch or roll as well as yaw. 'pitch roll yaw' */ -void SP_info_intermission() +void SP_info_intermission(void) { // so C can get at it VectorCopy(self->mangle, self->s.v.angles); //self.angles = self.mangle; @@ -299,7 +299,7 @@ void SaveLevelStartParams(gedict_t *e) player_params[cl].parm16 = g_globalvars.parm16; } -void InGameParams() +void InGameParams(void) { // NOTE: DO NOT USE self THERE @@ -314,7 +314,7 @@ void InGameParams() g_globalvars.parm9 = 0; } -void PrewarParams() +void PrewarParams(void) { // NOTE: DO NOT USE self THERE @@ -331,7 +331,7 @@ void PrewarParams() } // used before changing map in non deathmatch mode -void NonDMParams() +void NonDMParams(void) { if (ISDEAD(self)) { @@ -371,7 +371,7 @@ void NonDMParams() // // called ONLY on map reload, self is valid there // -void SetChangeParms() +void SetChangeParms(void) { // ok, server want to change map // check, if matchless mode is active, set ingame params, @@ -401,7 +401,7 @@ void SetChangeParms() // // called ONLY before player connected, self is _NOT_ valid there // -void SetNewParms() +void SetNewParms(void) { if ((match_in_progress == 2) || k_matchLess) { @@ -422,7 +422,7 @@ void SetNewParms() // // used in k_respawn() // -void SetRespawnParms() +void SetRespawnParms(void) { if (!deathmatch) { @@ -462,7 +462,7 @@ void SetRespawnParms() // called from PutClientInServer -void DecodeLevelParms() +void DecodeLevelParms(void) { self->s.v.items = g_globalvars.parm1; self->s.v.health = g_globalvars.parm2; @@ -518,7 +518,7 @@ gedict_t* Do_FindIntermission(char *info_name) Returns the entity to view from ============ */ -gedict_t* FindIntermission() +gedict_t* FindIntermission(void) { gedict_t *spot; @@ -552,7 +552,7 @@ gedict_t* FindIntermission() return world; } -void GotoNextMap() +void GotoNextMap(void) { char newmap[64] = { 0 }; @@ -606,7 +606,7 @@ void GotoNextMap() When the player presses attack or jump, change to the next level ============ */ -void IntermissionThink() +void IntermissionThink(void) { if (g_globalvars.time < intermission_exittime) { @@ -636,7 +636,7 @@ void IntermissionThink() to him personally ============ */ -void SendIntermissionToClient() +void SendIntermissionToClient(void) { if (!intermission_spot) { @@ -680,7 +680,7 @@ static void intermission_set_player_flags(gedict_t *player) player->model = ""; } -void execute_changelevel() +void execute_changelevel(void) { intermission_running = 1; @@ -714,7 +714,7 @@ void execute_changelevel() } } -void changelevel_touch() +void changelevel_touch(void) { if (other->ct != ctPlayer) { @@ -761,7 +761,7 @@ void changelevel_touch() When the player touches this, he gets sent to the map listed in the "map" variable. Unless the NO_INTERMISSION flag is set, the view will go to the info_intermission spot and display stats. */ -void SP_trigger_changelevel() +void SP_trigger_changelevel(void) { if (!self->map) { @@ -785,7 +785,7 @@ void SP_trigger_changelevel() /* go to the next level for deathmatch */ -void NextLevel() +void NextLevel(void) { gedict_t *o; char *entityfile; @@ -879,7 +879,7 @@ void NextLevel() ============================================================================= */ -void SP_info_player_deathmatch() +void SP_info_player_deathmatch(void) { gedict_t *spot; vec3_t saved_org; @@ -938,7 +938,7 @@ void k_respawn(gedict_t *p, qbool body) Player entered the suicide command ============ */ -void ClientKill() +void ClientKill(void) { if (cvar("sv_paused")) { @@ -1258,7 +1258,7 @@ gedict_t* SelectSpawnPoint(char *spawnname) return spot; } -qbool CanConnect() +qbool CanConnect(void) { gedict_t *p; char *t; @@ -1559,7 +1559,7 @@ qbool CanConnect() // self // params /////////////// -void ClientConnect() +void ClientConnect(void) { gedict_t *p; int i, totalspots; @@ -2301,7 +2301,7 @@ void PutClientInServer(void) */ // frag difference to win on tiebreak overtime -int tiecount() +int tiecount(void) { return (deathmatch == 4 ? 2 : 3); } @@ -2361,7 +2361,7 @@ void Check_SD(gedict_t *p) Exit deathmatch games upon conditions ============ */ -void CheckRules() +void CheckRules(void) { if (!match_in_progress) { @@ -2375,7 +2375,7 @@ void CheckRules() } //============================================================================ -void PlayerDeathThink() +void PlayerDeathThink(void) { float forward; float respawn_time; @@ -2450,7 +2450,7 @@ void PlayerDeathThink() k_respawn(self, true); } -void PlayerJump() +void PlayerJump(void) { //vec3_t start, end; @@ -2549,7 +2549,7 @@ void PlayerJump() ============ */ -void WaterMove() +void WaterMove(void) { //dprint (ftos(self->s.v.waterlevel)); if (self->s.v.movetype == MOVETYPE_NOCLIP) @@ -2699,7 +2699,7 @@ void WaterMove() } } -void MakeGhost() +void MakeGhost(void) { gedict_t *ghost; float f1 = 1; @@ -2792,9 +2792,9 @@ void set_important_fields(gedict_t *p) // GlobalParams: // self /////////////// -void ClientDisconnect() +void ClientDisconnect(void) { - extern void mv_stop_playback(); + extern void mv_stop_playback(void); k_nochange = 0; // force recalculate frags scores @@ -2906,7 +2906,7 @@ void ClientDisconnect() } } -void BackFromLag() +void BackFromLag(void) { int timing_players_action = TA_ALL & (int)cvar("timing_players_action"); @@ -2948,7 +2948,7 @@ void wp_wrap_cat(char *s, char *buf, int size) strlcat(buf, s, size); } -void Print_Wp_Stats() +void Print_Wp_Stats(void) { char buf[1024] = { 0 }; @@ -3128,7 +3128,7 @@ void Print_Wp_Stats() /* * Function is called when a player or spectator enables continuous score display with +scores console command. * */ -void Print_Scores() +void Print_Scores(void) { char buf[1024] = { 0 }, *last_va; @@ -3460,7 +3460,7 @@ float v_for_jump(int frametime_ms) } } -void ZeroFpsStats() +void ZeroFpsStats(void) { // zero these so the average/highest FPS is calculated for each delay period. self->fAverageFrameTime = 0; @@ -3469,7 +3469,7 @@ void ZeroFpsStats() self->fHighestFrameTime = 0.0001f; } -void mv_playback(); +void mv_playback(void); //////////////// // GlobalParams: @@ -3485,7 +3485,7 @@ void mv_playback(); ================ */ -void PlayerPreThink() +void PlayerPreThink(void) { float r; qbool zeroFps = false; @@ -3741,7 +3741,7 @@ void PlayerPreThink() */ extern void ktpro_autotrack_on_powerup_out(gedict_t *dude); -void CheckPowerups() +void CheckPowerups(void) { if (ISDEAD(self)) { @@ -4013,7 +4013,7 @@ void CheckLightEffects(void) } } -void check_callalias(); +void check_callalias(void); /////////// // BothPostThink @@ -4021,7 +4021,7 @@ void check_callalias(); // called for players and specs // ////////// -void BothPostThink() +void BothPostThink(void) { if (self->shownick_time && (self->shownick_time <= g_globalvars.time)) { @@ -4049,9 +4049,9 @@ void BothPostThink() check_callalias(); } -void W_WeaponFrame(); -void mv_record(); -void CheckStuffRune(); +void W_WeaponFrame(void); +void mv_record(void); +void CheckStuffRune(void); // ==================================== // { new weapon stats WS_ @@ -4184,7 +4184,7 @@ void info_wpsx_update(gedict_t* p, char* from, char* to) // } end of new weapon stats // ==================================== -void CheckLand() +void CheckLand(void) { // clear the flag if we landed if ((int)self->s.v.flags & FL_ONGROUND) @@ -4241,7 +4241,7 @@ void CheckLand() // time // self /////////////// -void PlayerPostThink() +void PlayerPostThink(void) { //dprint ("post think\n"); @@ -4405,7 +4405,7 @@ void SendTeamInfo(gedict_t *t) } } -void CheckTeamStatus() +void CheckTeamStatus(void) { gedict_t *p; int k_teamoverlay; @@ -4454,7 +4454,7 @@ void CheckTeamStatus() } } -void SendSpecInfo() +void SendSpecInfo(void) { gedict_t *t, *p; int cl, tr; diff --git a/src/coach.c b/src/coach.c index f071862d..d4dbbc8f 100644 --- a/src/coach.c +++ b/src/coach.c @@ -40,7 +40,7 @@ qbool is_coach(gedict_t *p) return false; } -void CancelCoaches() +void CancelCoaches(void) { gedict_t *p; @@ -62,7 +62,7 @@ void CancelCoaches() } } -void ExitCoach() +void ExitCoach(void) { if (!coach_num(self)) { @@ -82,7 +82,7 @@ void ExitCoach() } } -void VoteCoach() +void VoteCoach(void) { int till; gedict_t *p, *electguard; diff --git a/src/commands.c b/src/commands.c index 9a08773d..e4cacf05 100644 --- a/src/commands.c +++ b/src/commands.c @@ -25,237 +25,235 @@ int max_cmd_len = 0; qbool is_rules_change_allowed(void); void SendMessage(char *name); -float CountRPlayers(); -float CountTeams(); -void PlayerReady(qbool startIdlebot); -void PlayerSlowReady(); -void PlayerBreak(); -void ReqAdmin(); -void AdminForceStart(); -void AdminForceBreak(); -void AdminForceMap(); -void TogglePreWar(); -void ToggleMapLock(); -void AdminKick(); -void m_kick(); -void YesKick(); -void DontKick(); -void VoteAdmin(); -void VoteYes(); -void VoteNo(); -void VoteCaptain(); -void VoteCoach(); -void nospecs(); -void teamoverlay(); -void votecoop(); -void RandomPickup(); -void ShowDMM(); +float CountRPlayers(void); +float CountTeams(void); +void PlayerFastReady(void); +void PlayerSlowReady(void); +void PlayerBreak(void); +void ReqAdmin(void); +void AdminForceStart(void); +void AdminForceBreak(void); +void AdminForceMap(void); +void TogglePreWar(void); +void ToggleMapLock(void); +void AdminKick(void); +void m_kick(void); +void YesKick(void); +void DontKick(void); +void VoteAdmin(void); +void VoteYes(void); +void VoteNo(void); +void VoteCaptain(void); +void VoteCoach(void); +void nospecs(void); +void teamoverlay(void); +void votecoop(void); +void RandomPickup(void); +void ShowDMM(void); void ChangeDM(float dmm); -void ChangeLock(); -void ChangeOvertime(); -void ChangeOvertimeUp(); -void ChangeTP(); -void ToggleFallBunny(); +void ChangeLock(void); +void ChangeOvertime(void); +void ChangeOvertimeUp(void); +void ChangeTP(void); +void ToggleFallBunny(void); // { CTF -void FlagStatus(); -void TossFlag(); -void norunes(); -void nohook(); -void hooksmooth(); -void hookfast(); -void hookclassic(); -void hookcrhook(); -void noga(); -void mctf(); -void CTFBasedSpawn(); -// also: TossRune() -// swapall() +void FlagStatus(void); +void TossFlag(void); +void norunes(void); +void nohook(void); +void hooksmooth(void); +void hookfast(void); +void hookclassic(void); +void hookcrhook(void); +void noga(void); +void mctf(void); +void CTFBasedSpawn(void); // } CTF -void FragsDown(); -void FragsUp(); -void ListWhoNot(); -void ModStatus1(); -void ModStatus2(); -void ModStatusVote(); -void LastStats(); -void PlayerStats(); -void PlayerStatus(); -void PlayerStatusN(); -void PlayerStatusS(); -void PrintScores(); -void ReportMe(); -void SendKillerMsg(); -void SendNewcomerMsg(); -void SendVictimMsg(); -void ShowNick(); -void ShowCmds(); -void ShowMaps(); -//void ShowMessages(); -void ShowOpts(); -void ShowQizmo(); -void ShowRules(); -void ShowVersion(); -void ShowCharsetTableOctal(); -void ShowCharsetTableHexa(); -void killquad(); -void bloodfest(); -void antilag(); -void ToggleDischarge(); -void ToggleDropPack(); -void ToggleDropQuad(); -void ToggleDropRing(); -void ToggleFairPacks(); -void ToggleFreeze(); -void ToggleMidair(); -void SetMidairMinHeight(); -void ToggleFreshTeams(); -void ToggleFreshPacks(); -void ToggleFreshGuns(); -void ToggleFreshTime(); -void ToggleNoSweep(); -void ToggleInstagib(); +void FragsDown(void); +void FragsUp(void); +void ListWhoNot(void); +void ModStatus1(void); +void ModStatus2(void); +void ModStatusVote(void); +void LastStats(void); +void PlayerStats(void); +void PlayerStatus(void); +void PlayerStatusN(void); +void PlayerStatusS(void); +void PrintScores(void); +void ReportMe(void); +void SendKillerMsg(void); +void SendNewcomerMsg(void); +void SendVictimMsg(void); +void ShowNick(void); +void ShowCmds(void); +void ShowMaps(void); +//void ShowMessages(void); +void ShowOpts(void); +void ShowQizmo(void); +void ShowRules(void); +void ShowVersion(void); +void ShowCharsetTableOctal(void); +void ShowCharsetTableHexa(void); +void killquad(void); +void bloodfest(void); +void antilag(void); +void ToggleDischarge(void); +void ToggleDropPack(void); +void ToggleDropQuad(void); +void ToggleDropRing(void); +void ToggleFairPacks(void); +void ToggleFreeze(void); +void ToggleMidair(void); +void SetMidairMinHeight(void); +void ToggleFreshTeams(void); +void ToggleFreshPacks(void); +void ToggleFreshGuns(void); +void ToggleFreshTime(void); +void ToggleNoSweep(void); +void ToggleInstagib(void); void ToggleLGC(void); -void ToggleCGKickback(); -void TogglePowerups(); -void TogglePuPickup(); -void ToggleQEnemy(); -void ToggleQLag(); -void ToggleQPoint(); +void ToggleCGKickback(void); +void TogglePowerups(void); +void TogglePuPickup(void); +void ToggleQEnemy(void); +void ToggleQLag(void); +void ToggleQPoint(void); /* new FDP bits https://www.quakeworld.nu/wiki/FPD - void ToggleSkinForcing(); - void ToggleColorForcing(); - void TogglePitchSpeedLimit(); - void ToggleYawSpeedLimit(); + void ToggleSkinForcing(void); + void ToggleColorForcing(void); + void TogglePitchSpeedLimit(void); + void ToggleYawSpeedLimit(void); */ -void ToggleRespawns(); -void ToggleSpawnPoints(); -void ToggleBerzerk(); -void ToggleSpecTalk(); -void ToggleSpeed(); -void VotePickup(); +void ToggleRespawns(void); +void ToggleSpawnPoints(void); +void ToggleBerzerk(void); +void ToggleSpecTalk(void); +void ToggleSpeed(void); +void VotePickup(void); void UserMode(float umode); -void Wp_Reset(); +void Wp_Reset(void); void Wp_Stats(float on); void Sc_Stats(float on); void t_jump(float j_type); -void klist(); -void hdptoggle(); -void handicap(); -void noweapon(); -void tracklist(); -void fpslist(); -void krnd(); -void agree_on_map(); +void klist(void); +void hdptoggle(void); +void handicap(void); +void noweapon(void); +void tracklist(void); +void fpslist(void); +void krnd(void); +void agree_on_map(void); void favx_add(float fav_num); void xfav_go(float fav_num); -void fav_add(); -void fav_del(); -void fav_all_del(); -void fav_next(); -void fav_show(); +void fav_add(void); +void fav_del(void); +void fav_all_del(void); +void fav_next(void); +void fav_show(void); void AutoTrack(float autoTrackType); -void next_best(); -void next_pow(); -void Pos_Show(); -void Pos_Save(); -void Pos_Move(); +void next_best(void); +void next_pow(void); +void Pos_Show(void); +void Pos_Save(void); +void Pos_Move(void); void Pos_Set(float set_type); -void Sh_Speed(); -void lastscores(); -void SwapAll(); +void Sh_Speed(void); +void lastscores(void); +void SwapAll(void); -void motd_show(); +void motd_show(void); -void TogglePractice(); +void TogglePractice(void); // { yawn mode -void ToggleYawnMode(); -void setTeleportCap(); +void ToggleYawnMode(void); +void setTeleportCap(void); // } -void infolock(); -void infospec(); -void moreinfo(); +void infolock(void); +void infospec(void); +void moreinfo(void); -void s_p_cmd(); +void s_p_cmd(void); void s_lr_cmd(float l); -void s_t_cmd(); -void mmode(); -void multi(); -void cmdinfo(); -void cmduinfo(); -void cmd_wreg(); +void s_t_cmd(void); +void mmode(void); +void multi(void); +void cmdinfo(void); +void cmduinfo(void); +void cmd_wreg(void); -void ClientKill(); +void ClientKill(void); -void sv_time(); -void GrenadeMode(); -void ToggleReady(); +void sv_time(void); +void GrenadeMode(void); +void ToggleReady(void); void fp_toggle(float type); -void dlist(); -void dinfo(); +void dlist(void); +void dinfo(void); -void sv_lock(); -void force_spec(); -void teleteam(); +void sv_lock(void); +void force_spec(void); +void teleteam(void); void upplayers(float type); void downplayers(float type); -void iplist(); -void dmgfrags(); -void no_lg(); -void no_gl(); -void mv_cmd_playback(); -void mv_cmd_record(); -void mv_cmd_stop(); -void callalias(); -void fcheck(); -void mapcycle(); -void airstep(); -void ToggleExclusive(); -void ToggleNewCoopNm(); -void ToggleVwep(); -void TogglePause(); -void ToggleArena(); - -void Spawn666Time(); - -void noitems(); +void iplist(void); +void dmgfrags(void); +void no_lg(void); +void no_gl(void); +void mv_cmd_playback(void); +void mv_cmd_record(void); +void mv_cmd_stop(void); +void callalias(void); +void fcheck(void); +void mapcycle(void); +void airstep(void); +void ToggleExclusive(void); +void ToggleNewCoopNm(void); +void ToggleVwep(void); +void TogglePause(void); +void ToggleArena(void); + +void Spawn666Time(void); + +void noitems(void); // spec -void ShowCamHelp(); +void ShowCamHelp(void); void TeamSay(float fsndname); void TimeDown(float t); void TimeUp(float t); void TimeSet(float t); -void cmdslist_dl(); -void mapslist_dl(); +void cmdslist_dl(void); +void mapslist_dl(void); // { RACE -void r_cdel(); +void r_cdel(void); void r_clear_route(void); void r_Xset(float t); void r_changestatus(float t); void r_changefollowstatus(float t); -void r_timeout(); -void r_falsestart(); -void r_mode(); -void r_all_break(); +void r_timeout(void); +void r_falsestart(void); +void r_mode(void); +void r_all_break(void); -void r_route(); -void r_print(); +void r_route(void); +void r_print(void); -void race_display_line(); -void display_scores(); -void display_record_details(); -void race_chasecam_change(); -void race_chasecam_freelook_change(); -void race_download_record_demo(); +void race_display_line(void); +void display_scores(void); +void display_record_details(void); +void race_chasecam_change(void); +void race_chasecam_freelook_change(void); +void race_download_record_demo(void); void race_pacemaker(void); void race_simultaneous_toggle(void); void race_match_toggle(void); @@ -266,10 +264,10 @@ void race_hide_players_toggle(void); // } // { CHEATS -void giveme(); -static void dropitem(); -static void removeitem(); -static void dumpent(); +void giveme(void); +static void dropitem(void); +static void removeitem(void); +static void dumpent(void); // } // { Frogbots @@ -288,12 +286,12 @@ demo_marker_t demo_markers[10]; int demo_markers_count = 10; int demo_marker_index = 0; -void ClearDemoMarkers() +void ClearDemoMarkers(void) { demo_marker_index = 0; } -void DemoMark() +void DemoMark(void) { stuffcmd(self, "//demomark\n"); @@ -671,12 +669,12 @@ const char CD_NODESC[] = "no desc"; #define CD_GAMEMODES "list available game modes" -void dummy() +void dummy(void) { } -void redirect(); +void redirect(void); -#define DEF(ptr) ((void (*)())(ptr)) +#define DEF(ptr) ((void (*)(void))(ptr)) cmd_t cmds[] = { @@ -692,7 +690,7 @@ cmd_t cmds[] = { "stats", PlayerStats, 0, CF_BOTH | CF_MATCHLESS, CD_STATS }, { "effi", PlayerStats, 0, CF_BOTH | CF_MATCHLESS, CD_EFFI }, { "options", ShowOpts, 0, CF_PLAYER, CD_OPTIONS }, - { "ready", PlayerReady, 0, CF_BOTH | CF_MATCHLESS, CD_READY }, + { "ready", PlayerFastReady, 0, CF_BOTH | CF_MATCHLESS, CD_READY }, { "slowready", PlayerSlowReady, 0, CF_BOTH | CF_MATCHLESS, CD_SLOWREADY }, { "break", PlayerBreak, 0, CF_BOTH | CF_MATCHLESS, CD_BREAK }, { "status1", ModStatus1, 0, CF_BOTH | CF_MATCHLESS, CD_STATUS1 }, @@ -1221,7 +1219,7 @@ qbool isCmdFlood(gedict_t *p) return false; } -void redirect() +void redirect(void) { int i; char cmd_command[1024]; @@ -1330,7 +1328,7 @@ qbool isCmdRequireAdmin(int icmd, qbool isSpec) return false; } -void cmdslist_dl() +void cmdslist_dl(void) { int i, from, to; char *name, *params, arg_2[32]; @@ -1484,7 +1482,7 @@ void Do_ShowCmds(qbool adm_req) } } -void ShowCmds() +void ShowCmds(void) { Do_ShowCmds(false); // show common commands Do_ShowCmds(true); // show admin commands @@ -1530,7 +1528,7 @@ qbool check_perm(gedict_t *p, int perm) return true; } -void ShowOpts() +void ShowOpts(void) { G_sprint(self, 2, "%s... -1 mins match time\n" "%s..... +1 mins match time\n" @@ -1562,7 +1560,7 @@ void ShowOpts() redtext("gren_mode"), redtext("instagib"), redtext("berzerk")); } -void ShowQizmo() +void ShowQizmo(void) { G_sprint(self, 2, "%s....... lagsettings\n" "%s..... enemy vicinity reporting\n" @@ -1572,7 +1570,7 @@ void ShowQizmo() /* // ShowMessages and SendMessage command implementations added - void ShowMessages() + void ShowMessages(void) { G_sprint(self, 2, "%s..... who killed you last\n" @@ -1584,7 +1582,7 @@ void ShowQizmo() /* // Display all printable characters to console in octal table */ -void ShowCharsetTableHexa() +void ShowCharsetTableHexa(void) { int i; @@ -1610,7 +1608,7 @@ void ShowCharsetTableHexa() /* // Display all printable characters to console in hexadecimal table */ -void ShowCharsetTableOctal() +void ShowCharsetTableOctal(void) { int i; @@ -1632,7 +1630,7 @@ void ShowCharsetTableOctal() G_sprint(self, 2, "\n"); } -void ShowVersion() +void ShowVersion(void) { // limiting to 38 chars for VVD... G_sprint(self, 2, "\n\235\236\237 %s \235\236\236\236\236\236\236\236\236" @@ -1700,7 +1698,7 @@ void ShowVersion() "\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\237\n\n"); } -void ChangeOvertime() +void ChangeOvertime(void) { int f1, f2; @@ -1742,7 +1740,7 @@ void ChangeOvertime() } -void ChangeOvertimeUp() +void ChangeOvertimeUp(void) { int k_exttime = cvar("k_exttime"); @@ -1764,17 +1762,17 @@ void ChangeOvertimeUp() redtext(count_s(k_exttime))); } -void SendKillerMsg() +void SendKillerMsg(void) { SendMessage(self->killer); } -void SendVictimMsg() +void SendVictimMsg(void) { SendMessage(self->victim); } -void SendNewcomerMsg() +void SendNewcomerMsg(void) { SendMessage(newcomer->netname); } @@ -1814,7 +1812,7 @@ void SendMessage(char *name) G_sprint(self, 2, "No name to display\n"); } -static char* get_frp_str() +static char* get_frp_str(void) { switch (get_fair_pack()) { @@ -1832,7 +1830,7 @@ static char* get_frp_str() } } -void ModStatus1() +void ModStatus1(void) { int votes; gedict_t *p; @@ -1904,7 +1902,7 @@ void ModStatus1() } } -void ModStatus2() +void ModStatus2(void) { int i; char *ot = ""; @@ -2050,7 +2048,7 @@ void ModStatus2() } } -void ModStatusVote() +void ModStatusVote(void) { qbool voted = false; int votes, i; @@ -2338,7 +2336,7 @@ char* OnePlayerStatus(gedict_t *p, gedict_t *e_self) getname(p), (p == e_self ? redtext(" \x8D you") : "")); } -void PlayerStatus() +void PlayerStatus(void) { qbool found = false; gedict_t *p; @@ -2368,7 +2366,7 @@ void PlayerStatus() G_sprint(self, 2, "%s\n", (found ? "" : "no players")); } -void PlayerStatusS() +void PlayerStatusS(void) { qbool found = false; gedict_t *p; @@ -2391,7 +2389,7 @@ void PlayerStatusS() G_sprint(self, 2, "%s\n", (found ? "" : "no players")); } -void PlayerStatusN() +void PlayerStatusN(void) { qbool found = false; gedict_t *p; @@ -2436,7 +2434,7 @@ void PlayerStatusN() // broadcast not ready players -void ListWhoNot() +void ListWhoNot(void) { qbool found = false; gedict_t *p, *p2; @@ -2505,7 +2503,7 @@ void ListWhoNot() } } -void VotePickup() +void VotePickup(void) { int votes; @@ -2530,7 +2528,7 @@ void VotePickup() vote_check_pickup(); } -void ReportMe() +void ReportMe(void) { gedict_t *p; char *t1, *t2, *wt, *pa1, *pa2; @@ -2644,7 +2642,7 @@ void ReportMe() } } -void ToggleRespawns() +void ToggleRespawns(void) { int k_spw = bound(0, cvar("k_spw"), 4); @@ -2663,7 +2661,7 @@ void ToggleRespawns() G_bprint(2, "%s\n", respawn_model_name(k_spw)); } -void ToggleSpawnPoints() +void ToggleSpawnPoints(void) { if (match_in_progress) { @@ -2682,7 +2680,7 @@ void ToggleSpawnPoints() } } -void TogglePowerups() +void TogglePowerups(void) { char arg[64]; int i; @@ -2752,7 +2750,7 @@ void TogglePowerups() } } -void TogglePuPickup() +void TogglePuPickup(void) { if (match_in_progress) { @@ -2762,7 +2760,7 @@ void TogglePuPickup() cvar_toggle_msg(self, "k_pow_pickup", redtext("new powerups pickup (no multi pickup)")); } -void ToggleDischarge() +void ToggleDischarge(void) { if (match_in_progress) { @@ -2772,7 +2770,7 @@ void ToggleDischarge() cvar_toggle_msg(self, "k_dis", redtext("discharges")); } -void ShowDMM() +void ShowDMM(void) { G_sprint(self, 2, "Deathmatch %s\n", dig3(deathmatch)); } @@ -2808,7 +2806,7 @@ void ChangeDM(float dmm) G_bprint(2, "Deathmatch %s\n", dig3(deathmatch)); } -void ChangeTP() +void ChangeTP(void) { if (match_in_progress) { @@ -2953,7 +2951,7 @@ void AdjustFragLimit(int delta) fraglimit = bound(isHoonyModeAny() ? 0 : 1, fraglimit, isHoonyModeDuel() ? 20 : 100); } -void FragsDown() +void FragsDown(void) { if (match_in_progress) { @@ -3001,7 +2999,7 @@ void FragsDown() } } -void FragsUp() +void FragsUp(void) { if (match_in_progress) { @@ -3029,7 +3027,7 @@ void FragsUp() } } -void killquad() +void killquad(void) { if (match_in_progress) { @@ -3040,7 +3038,7 @@ void killquad() k_killquad = cvar("k_killquad"); } -void bloodfest() +void bloodfest(void) { if (match_in_progress) { @@ -3051,7 +3049,7 @@ void bloodfest() k_bloodfest = cvar("k_bloodfest"); } -void ToggleDropQuad() +void ToggleDropQuad(void) { if (match_in_progress) { @@ -3061,7 +3059,7 @@ void ToggleDropQuad() cvar_toggle_msg(self, "dq", redtext("DropQuad")); } -void ToggleDropRing() +void ToggleDropRing(void) { if (match_in_progress) { @@ -3071,7 +3069,7 @@ void ToggleDropRing() cvar_toggle_msg(self, "dr", redtext("DropRing")); } -void ToggleDropPack() +void ToggleDropPack(void) { if (match_in_progress) { @@ -3081,7 +3079,7 @@ void ToggleDropPack() cvar_toggle_msg(self, "dp", redtext("DropPacks")); } -void ToggleFairPacks() +void ToggleFairPacks(void) { int k_frp = bound(0, cvar("k_frp"), 2); @@ -3121,7 +3119,7 @@ void ToggleFairPacks() } } -void ToggleSpeed() +void ToggleSpeed(void) { gedict_t *p; @@ -3148,7 +3146,7 @@ void ToggleSpeed() } } -void ToggleBerzerk() +void ToggleBerzerk(void) { if (match_in_progress) { @@ -3158,7 +3156,7 @@ void ToggleBerzerk() cvar_toggle_msg(self, "k_bzk", redtext("Berzerk mode")); } -void ToggleSpecTalk() +void ToggleSpecTalk(void) { int k_spectalk = !cvar("k_spectalk"), fpd = iKey(world, "fpd"); @@ -3205,7 +3203,7 @@ void ToggleSpecTalk() } } -void ShowRules() +void ShowRules(void) { if (isDuel()) { @@ -3250,7 +3248,7 @@ void ShowRules() G_sprint(self, 2, "\n"); } -void ChangeLock() +void ChangeLock(void) { int lock = bound(0, cvar("k_lockmode"), 2); @@ -3303,7 +3301,7 @@ void TeamSay(float fsndname) } } -void PrintScores() +void PrintScores(void) { int minutes, seconds; gedict_t *p; @@ -3451,7 +3449,7 @@ void PrintScores() } // This Endgame statistics is triggered by the ingame /laststats command. -void LastStats() +void LastStats(void) { if (match_in_progress) { @@ -3464,7 +3462,7 @@ void LastStats() } // This player statistics is triggered by the ingame /stats command. Nothing to do with the endgame stats. -void PlayerStats() +void PlayerStats(void) { gedict_t *p, *p2; char *tmp, *stats; @@ -3592,7 +3590,7 @@ void PlayerStats() } } -void ToggleQLag() +void ToggleQLag(void) { int fpd = iKey(world, "fpd"); @@ -3609,7 +3607,7 @@ void ToggleQLag() ((fpd & 8) ? "in effect" : "not in effect")); } -void ToggleQEnemy() +void ToggleQEnemy(void) { int fpd = iKey(world, "fpd"); @@ -3625,7 +3623,7 @@ void ToggleQEnemy() G_bprint(2, "%s %s\n", redtext("QiZmo enemy reporting"), Allowed(fpd & 32)); } -void ToggleQPoint() +void ToggleQPoint(void) { int fpd = iKey(world, "fpd"); @@ -3642,7 +3640,7 @@ void ToggleQPoint() } /* new FDP bits https://www.quakeworld.nu/wiki/FPD - void ToggleSkinForcing() + void ToggleSkinForcing(void) { int fpd = iKey( world, "fpd" ); @@ -3657,7 +3655,7 @@ void ToggleQPoint() redtext("Skin forcing"), Enabled( !(fpd & 256) )); } - void ToggleColorForcing() + void ToggleColorForcing(void) { int fpd = iKey( world, "fpd" ); @@ -3672,7 +3670,7 @@ void ToggleQPoint() redtext("Color forcing"), Enabled( !(fpd & 512) )); } - void TogglePitchSpeedLimit() + void TogglePitchSpeedLimit(void) { int fpd = iKey( world, "fpd" ); @@ -3687,7 +3685,7 @@ void ToggleQPoint() redtext("Pitch speed limit"), Enabled( fpd & 16384 )); } - void ToggleYawSpeedLimit() + void ToggleYawSpeedLimit(void) { int fpd = iKey( world, "fpd" ); @@ -3703,7 +3701,7 @@ void ToggleQPoint() } */ -void ToggleFreeze() +void ToggleFreeze(void) { if (match_in_progress) { @@ -3715,7 +3713,7 @@ void ToggleFreeze() // qqshka: pointing code stolen from Zquake -void ShowNick() +void ShowNick(void) { gedict_t *p, *bp = NULL; char *s1, *s2, *pups, *kn, buf[256] = @@ -4791,7 +4789,7 @@ void SetPractice(int srv_practice_mode, const char *map) } } -void TogglePractice() +void TogglePractice(void) { int lock_practice = cvar("lock_practice"); int allow_toggle_practice = cvar("allow_toggle_practice"); @@ -4858,7 +4856,7 @@ void TogglePractice() } // allow reset weapon stats in prewar -void Wp_Reset() +void Wp_Reset(void) { if (match_in_progress) { @@ -4884,9 +4882,9 @@ void Sc_Stats(float on) self->sc_stats_time = g_globalvars.time; // force show/hide } -void W_WeaponFrame(); +void W_WeaponFrame(void); -void kfjump() +void kfjump(void) { int button0 = self->s.v.button0; @@ -4910,7 +4908,7 @@ void kfjump() self->s.v.button0 = button0; // restore button state } -void krjump() +void krjump(void) { int button0 = self->s.v.button0; float va_x = self->s.v.v_angle[0]; @@ -4951,7 +4949,7 @@ void t_jump(float j_type) G_bprint(2, "%s %s %s\n", self->netname, redtext(Enables(!cvar(cv_jt))), redtext(jt)); } -void klist() +void klist(void) { int i, hdc; gedict_t *p = world; @@ -5049,7 +5047,7 @@ void klist() } } -void hdptoggle() +void hdptoggle(void) { if (match_in_progress) { @@ -5061,7 +5059,7 @@ void hdptoggle() redtext("handicap")); } -void handicap() +void handicap(void) { char arg_2[1024]; @@ -5084,7 +5082,7 @@ void show_disallowed_weapons(int k_disallow_weapons) G_sprint(self, 2, "weapons disallowed:%s\n", (strnull(dwp) ? redtext(" none") : redtext(dwp))); } -void noweapon() +void noweapon(void) { char arg_2[1024]; int k_disallow_weapons = (int)cvar("k_disallow_weapons") & DA_WPNS; @@ -5169,17 +5167,17 @@ void noweapon() } } -void no_lg() +void no_lg(void) { stuffcmd_flags(self, STUFFCMD_IGNOREINDEMO, "cmd noweapon lg\n"); } -void no_gl() +void no_gl(void) { stuffcmd_flags(self, STUFFCMD_IGNOREINDEMO, "cmd noweapon gl\n"); } -void tracklist() +void tracklist(void) { int i; gedict_t *p; @@ -5204,7 +5202,7 @@ void tracklist() } } -void fpslist() +void fpslist(void) { int i; gedict_t *p; @@ -5240,7 +5238,7 @@ void fpslist() } // This is designed for pickup games and creates totally random teams(ish) -void RandomPickup() +void RandomPickup(void) { int votes; @@ -5303,7 +5301,7 @@ void del_from_specs_favourites(gedict_t *rm) } } -void fav_add() +void fav_add(void) { int fav_num, free_num; gedict_t *goal = PROG_TO_EDICT(self->s.v.goalentity); @@ -5402,7 +5400,7 @@ qbool favx_del_do(gedict_t *s, gedict_t *p, char *prefix) return removed; } -void fav_del() +void fav_del(void) { gedict_t *goal = PROG_TO_EDICT(self->s.v.goalentity); int diff = (int)(goal - world); @@ -5422,7 +5420,7 @@ void fav_del() G_sprint(self, 2, "fav_del: %s is %s favourites\n", goal->netname, redtext("not in")); } -void fav_all_del() +void fav_all_del(void) { qbool deleted = false; int fav_num; @@ -5461,7 +5459,7 @@ void favx_add(float fav_num) self->favx[(int)fav_num - 1] = diff; } -void fav_next() +void fav_next(void) { int pl_num, fav_num, first_fav, desired_fav; gedict_t *goal = PROG_TO_EDICT(self->s.v.goalentity), *p; @@ -5585,7 +5583,7 @@ void xfav_go(float fav_num) stuffcmd_flags(self, STUFFCMD_IGNOREINDEMO, "track %d\n", GetUserID(p)); } -void fav_show() +void fav_show(void) { gedict_t *p; qbool first, showed = false; @@ -5732,7 +5730,7 @@ static void ResetNormalAutoTrack(gedict_t *cl) cl->autotrack_hint = NULL; } -void DoAutoTrack() +void DoAutoTrack(void) { gedict_t *p = NULL, *goal; int id; @@ -5847,7 +5845,7 @@ void AutoTrack(float autoTrackType) G_sprint(self, 2, "%s %s\n", redtext(at_txt), OnOff(self->autotrack)); } -void AutoTrackRestore() +void AutoTrackRestore(void) { autoTrackType_t at = iKey(self, "*at"); @@ -6037,7 +6035,7 @@ void ktpro_autotrack_predict_powerup(void) // << end ktpro compatible autotrack -void next_best() +void next_best(void) { gedict_t *b1 = get_ed_best1(), *b2 = get_ed_best2(); gedict_t *goal = PROG_TO_EDICT(self->s.v.goalentity), *to; @@ -6068,7 +6066,7 @@ void next_best() } } -void next_pow() +void next_pow(void) { gedict_t *goal = PROG_TO_EDICT(self->s.v.goalentity), *to, *first, *p; qbool nextBreak = false; @@ -6134,7 +6132,7 @@ void next_pow() // common functions #define Pos_Disallowed() (match_in_progress || intermission_running || cvar( "sv_paused" ) || (isRACE() && race.status)) // parse pos_show/pos_save/pos_move -int Pos_Get_idx() +int Pos_Get_idx(void) { char arg_2[1024]; @@ -6148,7 +6146,7 @@ int Pos_Get_idx() return 0; } // Show functions -void Pos_Show() +void Pos_Show(void) { int idx; pos_t *pos; @@ -6170,7 +6168,7 @@ void Pos_Show() #define Pos_Save_angles(pos) VectorCopy(self->s.v.v_angle, (pos)->v_angle) #define Pos_Save_velocity(pos) VectorCopy(self->s.v.velocity, (pos)->velocity) // pos_save -void Pos_Save() +void Pos_Save(void) { int idx; pos_t *pos; @@ -6235,7 +6233,7 @@ qbool Pos_Set_origin(pos_t *pos) #define Pos_Set_velocity(pos) VectorCopy((pos)->velocity, self->s.v.velocity) // pos_move -void Pos_Move() +void Pos_Move(void) { int idx; pos_t *pos; @@ -6348,18 +6346,18 @@ void Pos_Set(float set_type) // pos_show/pos_save/pos_move/pos_set_* commands } //================================================ -void Sh_Speed() +void Sh_Speed(void) { stuffcmd_flags(self, STUFFCMD_IGNOREINDEMO, "cmd info kf %d\n", (iKey(self, "kf") ^ KF_SPEED)); } // /motd command -void PMOTDThink(); -void SMOTDThink(); +void PMOTDThink(void); +void SMOTDThink(void); // often times you play a game on non-symmetrical map as one color then swap teams and play again to be fair -void SwapAll() +void SwapAll(void) { int votes; @@ -6401,7 +6399,7 @@ void SwapAll() vote_check_swapall(); } -void motd_show() +void motd_show(void) { gedict_t *motd; int owner = EDICT_TO_PROG(self); @@ -6433,7 +6431,7 @@ void motd_show() motd->attack_finished = g_globalvars.time + 10; } -void krnd() +void krnd(void) { int argc, i; char arg_x[1024], buf[2048] = @@ -6468,7 +6466,7 @@ void krnd() G_bprint(2, "selected: \220%s\221\n", arg_x); } -void agree_on_map() +void agree_on_map(void) { if (!k_lastvotedmap) { @@ -6517,7 +6515,7 @@ char* lastscores2str(lsType_t lst) } } -void lastscore_add() +void lastscore_add(void) { gedict_t *p; gedict_t *ed1 = get_ed_scores1(); @@ -6707,7 +6705,7 @@ void lastscore_add() } } -void lastscores() +void lastscores(void) { int i; int j; @@ -6793,12 +6791,12 @@ void lastscores() // { spec moreinfo -qbool mi_on() +qbool mi_on(void) { return ((int)cvar("k_spec_info") & MI_ON); } -qbool mi_adm_only() +qbool mi_adm_only(void) { return ((int)cvar("k_spec_info") & MI_ADM_ONLY); } @@ -6877,7 +6875,7 @@ void mi_print(gedict_t *tooker, int it, char *msg) } } -void moreinfo() +void moreinfo(void) { int level; @@ -6931,7 +6929,7 @@ void info_mi_update(gedict_t *p, char *from, char *to) G_sprint(p, 2, "%s\n", mi_levels[level].desc); } -void infolock() +void infolock(void) { int k_spec_info = cvar("k_spec_info"); @@ -6960,7 +6958,7 @@ void infolock() } } -void infospec() +void infospec(void) { int k_spec_info = cvar("k_spec_info"); @@ -6979,7 +6977,7 @@ void infospec() // { wreg -void wreg_usage() +void wreg_usage(void) { G_sprint(self, 2, "usage: cmd wreg [[char] [[+/-]weapon order]]\n"); } @@ -7016,7 +7014,7 @@ void wreg_showslot(wreg_t *w, int slot) G_sprint(self, 2, "slot \"%c\" - \"%s%s\"\n", (char) slot, sign, order); } -void cmd_wreg() +void cmd_wreg(void) { int argc = trap_CmdArgc(), attack = 0, imp[MAX_WREG_IMP], i, cnt; char arg_1[64], arg_2[64], *tmp = arg_2; @@ -7252,7 +7250,7 @@ void cmd_wreg_do(byte c) // } -void ToggleMidair() +void ToggleMidair(void) { if (!is_rules_change_allowed()) { @@ -7286,7 +7284,7 @@ void ToggleMidair() cvar_toggle_msg(self, "k_midair", redtext("Midair")); } -void SetMidairMinHeight() +void SetMidairMinHeight(void) { int k_midair_minheight = bound(0, cvar("k_midair_minheight"), 4); @@ -7332,9 +7330,9 @@ void SetMidairMinHeight() } } -void W_SetCurrentAmmo(); +void W_SetCurrentAmmo(void); -void ToggleFreshTeams() +void ToggleFreshTeams(void) { if (!is_rules_change_allowed()) { @@ -7352,7 +7350,7 @@ void ToggleFreshTeams() cvar_toggle_msg(self, "k_freshteams", "&c08fFreshTeams&r"); } -void ToggleFreshPacks() // FreshPacks is enabled by default when playing freshteams +void ToggleFreshPacks(void) // FreshPacks is enabled by default when playing freshteams { int k_freshteams = cvar("k_freshteams"); @@ -7372,7 +7370,7 @@ void ToggleFreshPacks() // FreshPacks is enabled by default when playing fresht cvar_toggle_msg(self, "k_freshteams_limit_packs", "&c08fFreshPacks&r (limited backpack ammo)"); } -void ToggleFreshGuns() // FreshGuns is enabled by default when playing freshteams +void ToggleFreshGuns(void) // FreshGuns is enabled by default when playing freshteams { int k_freshteams = cvar("k_freshteams"); @@ -7392,7 +7390,7 @@ void ToggleFreshGuns() // FreshGuns is enabled by default when playing freshteam cvar_toggle_msg(self, "k_freshteams_limit_sweep_ammo", "&c08fFreshGuns&r (limited weapon ammo on sweep)"); } -void ToggleFreshTime() +void ToggleFreshTime(void) { int k_freshteams = cvar("k_freshteams"); int k_freshtime = bound(0, cvar("k_freshteams_weapon_time"), 60); @@ -7426,7 +7424,7 @@ void ToggleFreshTime() } } -void ToggleNoSweep() +void ToggleNoSweep(void) { if (!is_rules_change_allowed()) { @@ -7444,7 +7442,7 @@ void ToggleNoSweep() cvar_toggle_msg(self, "k_nosweep", redtext("NoSweep")); } -void ToggleInstagib() +void ToggleInstagib(void) { int k_instagib = bound(0, cvar("k_instagib"), 3); char buf[1024 * 4]; @@ -7591,7 +7589,7 @@ void ToggleLGC(void) W_SetCurrentAmmo(); } -void ToggleCGKickback() +void ToggleCGKickback(void) { if (match_in_progress) { @@ -7608,7 +7606,7 @@ void ToggleCGKickback() cvar_toggle_msg(self, "k_cg_kb", redtext("Coilgun kickback")); } -void sv_time() +void sv_time(void) { char date[64]; @@ -7618,7 +7616,7 @@ void sv_time() } } -void GrenadeMode() +void GrenadeMode(void) { if (!is_rules_change_allowed()) { @@ -7642,7 +7640,7 @@ void GrenadeMode() } } -void ToggleReady() +void ToggleReady(void) { if (isRACE()) { @@ -7656,22 +7654,22 @@ void ToggleReady() } else { - PlayerReady(true); + PlayerFastReady(); } } -void dlist() +void dlist(void) { stuffcmd_flags(self, STUFFCMD_IGNOREINDEMO, "cmd demolist %s\n", params_str(1, -1)); } -void dinfo() +void dinfo(void) { stuffcmd_flags(self, STUFFCMD_IGNOREINDEMO, "cmd demoinfo %s\n", params_str(1, -1)); } // ktpro (c) -void teleteam() +void teleteam(void) { int k_tp_tele_death = bound(0, cvar("k_tp_tele_death"), 1); @@ -7749,7 +7747,7 @@ void iplist_one(gedict_t *s, gedict_t *p) } // ktpro (c) -void iplist() +void iplist(void) { int i; gedict_t *p; @@ -7784,7 +7782,7 @@ void iplist() } } -void dmgfrags() +void dmgfrags(void) { if (!is_rules_change_allowed()) { @@ -7797,15 +7795,15 @@ void dmgfrags() // { movie, for trix record in memory // code is partially wroten by Tonik -void mv_stop_record(); -qbool mv_is_recording(); +void mv_stop_record(void); +qbool mv_is_recording(void); -qbool mv_is_playback() +qbool mv_is_playback(void) { return self->is_playback; } -void mv_stop_playback() +void mv_stop_playback(void) { if (!mv_is_playback()) { @@ -7823,7 +7821,7 @@ void mv_stop_playback() self->is_playback = false; } -qbool mv_can_playback() +qbool mv_can_playback(void) { if (match_in_progress || intermission_running) { @@ -7843,7 +7841,7 @@ qbool mv_can_playback() return true; } -void mv_playback() +void mv_playback(void) { gedict_t *pb_ent = self->pb_ent; float scale; @@ -7896,7 +7894,7 @@ void mv_playback() pb_ent->s.v.colormap = fp->colormap; } -void mv_cmd_playback() +void mv_cmd_playback(void) { mv_stop_record(); // stop record first mv_stop_playback(); // stop playback first @@ -7921,12 +7919,12 @@ void mv_cmd_playback() self->is_playback = true; } -qbool mv_is_recording() +qbool mv_is_recording(void) { return self->is_recording; } -void mv_stop_record() +void mv_stop_record(void) { if (!mv_is_recording()) { @@ -7938,7 +7936,7 @@ void mv_stop_record() self->is_recording = false; } -qbool mv_can_record() +qbool mv_can_record(void) { if (match_in_progress || intermission_running) { @@ -7958,7 +7956,7 @@ qbool mv_can_record() return true; } -void mv_record() +void mv_record(void) { plrfrm_t *f; @@ -7988,7 +7986,7 @@ void mv_record() self->rec_count++; } -void mv_cmd_record() +void mv_cmd_record(void) { mv_stop_record(); // stop record first mv_stop_playback(); // stop playback first @@ -8008,7 +8006,7 @@ void mv_cmd_record() self->is_recording = true; } -void mv_cmd_stop() +void mv_cmd_stop(void) { mv_stop_record(); // stop record mv_stop_playback(); // stop playback @@ -8018,7 +8016,7 @@ void mv_cmd_stop() // ktpro (c) // /cmd callalias -void callalias() +void callalias(void) { const int ca_limit = 15, ca_limit2 = 30; char arg_x[1024]; @@ -8069,7 +8067,7 @@ void callalias() self->callalias_time = g_globalvars.time + tm; } -void check_callalias() +void check_callalias(void) { if (!self->callalias_time || (self->callalias_time > g_globalvars.time)) { @@ -8085,7 +8083,7 @@ void check_callalias() char fcheck_name[128]; -void fcheck() +void fcheck(void) { char arg_x[1024]; int i; @@ -8146,7 +8144,7 @@ void fcheck() } } -void check_fcheck() +void check_fcheck(void) { gedict_t *p; char *nl, *tmp; @@ -8184,7 +8182,7 @@ void check_fcheck() f_check = 0; } -void mapcycle() +void mapcycle(void) { char var[128], *newmap = ""; int i; @@ -8221,7 +8219,7 @@ void mapcycle() } } -void airstep() +void airstep(void) { if (match_in_progress || isRACE()) { @@ -8231,7 +8229,7 @@ void airstep() cvar_toggle_msg(self, "pm_airstep", redtext("pm_airstep")); } -void ToggleVwep() +void ToggleVwep(void) { gedict_t *p, *oself; @@ -8261,7 +8259,7 @@ void ToggleVwep() self = oself; } -void ToggleExclusive() +void ToggleExclusive(void) { if (match_in_progress) { @@ -8271,7 +8269,7 @@ void ToggleExclusive() cvar_toggle_msg(self, "k_exclusive", redtext("exclusive mode")); } -void ToggleNewCoopNm() +void ToggleNewCoopNm(void) { if (match_in_progress) { @@ -8284,14 +8282,14 @@ void ToggleNewCoopNm() // { yawn mode related // { yawn mode related -void FixYawnMode() +void FixYawnMode(void) { k_yawnmode = cvar("k_yawnmode"); k_teleport_cap = bound(0, cvar("k_teleport_cap"), 100); } // Toggle yawnmode, implemented by Molgrum -void ToggleYawnMode() +void ToggleYawnMode(void) { if (!is_rules_change_allowed()) { @@ -8303,7 +8301,7 @@ void ToggleYawnMode() FixYawnMode(); // apply changes ASAP } -void setTeleportCap() +void setTeleportCap(void) { char arg[256]; @@ -8374,7 +8372,7 @@ void PausedTic(int duration) } } -void TogglePause() +void TogglePause(void) { int minutes, seconds; gedict_t *p; @@ -8454,7 +8452,7 @@ void TogglePause() } } -void WillPause() +void WillPause(void) { gedict_t *p; int time = when_to_pause - g_globalvars.time+1; @@ -8490,7 +8488,7 @@ void WillPause() trap_setpause(1); } -void ToggleArena() +void ToggleArena(void) { if (!is_rules_change_allowed()) { @@ -8538,7 +8536,7 @@ void ToggleArena() } } -void Spawn666Time() +void Spawn666Time(void) { char arg_2[1024]; float dmm4_invinc_time; @@ -8574,7 +8572,7 @@ void Spawn666Time() trap_cvar_set_float("dmm4_invinc_time", dmm4_invinc_time ? dmm4_invinc_time : -1); } -void noitems() +void noitems(void) { if (match_in_progress) { @@ -8592,7 +8590,7 @@ void giveme_usage(void) "giveme norunes\n"); } -void giveme() +void giveme(void) { char arg_2[128]; char arg_3[128]; @@ -8707,12 +8705,12 @@ typedef struct char *classname; int spawnflags; int angle; // should we set angles or not. - void (*spawn)(); // custom spawn function, called after actual spawn. + void (*spawn)(void); // custom spawn function, called after actual spawn. } dropitem_spawn_t; #define WEAPON_BIG2 1 -static void dropitem_spawn_spawnpoint() +static void dropitem_spawn_spawnpoint(void) { int effects = EF_GREEN | EF_RED; // default effects. @@ -8853,7 +8851,7 @@ static void dropitem_usage(void) } } -static void dropitem() +static void dropitem(void) { dropitem_spawn_t *di; char arg_1[128]; @@ -8900,7 +8898,7 @@ static void dropitem() } } -static void removeitem() +static void removeitem(void) { gedict_t *ent; gedict_t *p = NULL; @@ -8978,7 +8976,7 @@ static void dump_print(fileHandle_t file_handle, const char *fmt, ...) trap_FS_WriteFile(text, strlen(text), file_handle); } -static void dumpent() +static void dumpent(void) { int cnt = 0; gedict_t *p; @@ -9115,7 +9113,7 @@ void lgc_register_fire_stop(gedict_t *player) player->lgc_state = lgcUndershaft; } -void ListGameModes() +void ListGameModes(void) { const char *known[] = { diff --git a/src/ctf.c b/src/ctf.c index 25f9c9b0..78f433da 100644 --- a/src/ctf.c +++ b/src/ctf.c @@ -32,11 +32,11 @@ #define CARRIER_DEFEND_TIME 4 void DropFlag(gedict_t *flag, qbool tossed); -void PlaceFlag(); -void FlagThink(); -void FlagTouch(); -void SP_item_flag_team1(); -void SP_item_flag_team2(); +void PlaceFlag(void); +void FlagThink(void); +void FlagTouch(void); +void SP_item_flag_team1(void); +void SP_item_flag_team2(void); // Allows us to add flags (or other items) to dm maps when ctfing without actually changing bsp void G_CallSpawn(gedict_t *ent); @@ -52,7 +52,7 @@ void SpawnCTFItem(char *classname, float x, float y, float z, float angle) G_CallSpawn(item); } -void spawn_item_flag() +void spawn_item_flag(void) { if (k_ctf_custom_models) { @@ -92,7 +92,7 @@ void spawn_item_flag() } } -void SP_item_flag_team1() +void SP_item_flag_team1(void) { self->k_teamnumber = 1; self->s.v.items = IT_KEY2; @@ -107,7 +107,7 @@ void SP_item_flag_team1() spawn_item_flag(); } -void SP_item_flag_team2() +void SP_item_flag_team2(void) { self->k_teamnumber = 2; self->s.v.items = IT_KEY1; @@ -123,7 +123,7 @@ void SP_item_flag_team2() } // would love to know what a ctf wall is :O! -void SP_func_ctf_wall() +void SP_func_ctf_wall(void) { SetVector(self->s.v.angles, 0, 0, 0); self->s.v.movetype = MOVETYPE_PUSH; @@ -134,7 +134,7 @@ void SP_func_ctf_wall() #define TF_TEAM_BLUE 1 #define TF_TEAM_RED 2 -void SP_item_tfgoal() +void SP_item_tfgoal(void) { // NOTE: team_no inverted for flags!!! @@ -156,7 +156,7 @@ void SP_item_tfgoal() } } -void SP_info_player_teamspawn() +void SP_info_player_teamspawn(void) { if (self->team_no == TF_TEAM_RED) { @@ -174,7 +174,7 @@ void SP_info_player_teamspawn() } } -void SP_i_p_t() +void SP_i_p_t(void) { self->classname = "info_player_teamspawn"; SP_info_player_teamspawn(); @@ -263,7 +263,7 @@ void RegenFlags(qbool yes) } } -void FlagThink() +void FlagThink(void) { if (!isCTF()) { @@ -301,7 +301,7 @@ void FlagThink() self->cnt2 += 0.1; } -void FlagTouch() +void FlagTouch(void) { gedict_t *p, *owner; @@ -477,7 +477,7 @@ void FlagTouch() setmodel(self, ""); } -void FlagResetOwner() +void FlagResetOwner(void) { self->think = (func_t) FlagThink; self->touch = (func_t) FlagTouch; @@ -485,7 +485,7 @@ void FlagResetOwner() self->s.v.owner = EDICT_TO_PROG(self); } -void TossFlag() +void TossFlag(void) { PlayerDropFlag(self, true); } @@ -588,7 +588,7 @@ void DropFlag(gedict_t *flag, qbool tossed) refresh_plus_scores(); // update players status bar faster } -void FlagStatus() +void FlagStatus(void) { gedict_t *flag1, *flag2; @@ -721,7 +721,7 @@ void CTF_CheckFlagsAsKeys(void) } } -void norunes() +void norunes(void) { if (match_in_progress && !k_matchLess) { @@ -755,7 +755,7 @@ void norunes() } } -void nohook() +void nohook(void) { if (match_in_progress && !k_matchLess) { @@ -785,7 +785,7 @@ void nohook() } } -void noga() +void noga(void) { if (match_in_progress && !k_matchLess) { @@ -802,7 +802,7 @@ void noga() cvar_toggle_msg(self, "k_ctf_ga", redtext("green armor")); } -void mctf() +void mctf(void) { if (match_in_progress && !k_matchLess) { @@ -846,7 +846,7 @@ void mctf() } } -void CTFBasedSpawn() +void CTFBasedSpawn(void) { if (match_in_progress && !k_matchLess) { diff --git a/src/doors.c b/src/doors.c index fc616321..223ae7a7 100644 --- a/src/doors.c +++ b/src/doors.c @@ -56,14 +56,14 @@ //#define STATE_BOTTOM 1; //#define STATE_UP 2; //#define STATE_DOWN 3; -void door_blocked(); -void door_hit_top(); -void door_hit_bottom(); -void door_go_down(); -void door_go_up(); -void door_fire(); - -void door_blocked() +void door_blocked(void); +void door_hit_top(void); +void door_hit_bottom(void); +void door_go_down(void); +void door_go_up(void); +void door_fire(void); + +void door_blocked(void) { other->deathtype = dtSQUISH; T_Damage(other, self, PROG_TO_EDICT(self->s.v.goalentity), self->dmg); @@ -83,7 +83,7 @@ void door_blocked() } } -void door_hit_top() +void door_hit_top(void) { sound(self, CHAN_NO_PHS_ADD + CHAN_VOICE, self->noise1, 1, ATTN_NORM); self->state = STATE_TOP; @@ -104,7 +104,7 @@ void door_hit_top() self->s.v.nextthink = self->s.v.ltime + self->wait; } -void door_hit_bottom() +void door_hit_bottom(void) { sound(self, CHAN_NO_PHS_ADD + CHAN_VOICE, self->noise1, 1, ATTN_NORM); self->state = STATE_BOTTOM; @@ -117,7 +117,7 @@ void door_hit_bottom() #endif } -void door_go_down() +void door_go_down(void) { sound(self, CHAN_VOICE, self->noise2, 1, ATTN_NORM); if (self->s.v.max_health) @@ -130,7 +130,7 @@ void door_go_down() SUB_CalcMove(self->pos1, self->speed, door_hit_bottom); } -void door_go_up() +void door_go_up(void) { if (self->state == STATE_UP) { @@ -160,7 +160,7 @@ void door_go_up() ============================================================================= */ -void door_fire() +void door_fire(void) { gedict_t *oself, *starte; @@ -209,7 +209,7 @@ void door_fire() self = oself; } -void door_use() +void door_use(void) { gedict_t *oself; @@ -223,7 +223,7 @@ void door_use() self = oself; } -void door_trigger_touch() +void door_trigger_touch(void) { // return if countdown or map frozen if (!k_practice) // #practice mode# @@ -252,7 +252,7 @@ void door_trigger_touch() door_use(); } -void door_killed() +void door_killed(void) { gedict_t *oself; @@ -280,7 +280,7 @@ void door_killed() Prints messages and opens key doors ================ */ -void door_touch() +void door_touch(void) { char *msg; @@ -443,7 +443,7 @@ qbool EntitiesTouching(gedict_t *e1, gedict_t *e2) ============= */ -void LinkDoors() +void LinkDoors(void) { gedict_t *t, *starte; vec3_t cmins, cmaxs; @@ -587,7 +587,7 @@ void LinkDoors() 4) screechy metal */ -void SP_func_door() +void SP_func_door(void) { float tmp; @@ -751,13 +751,13 @@ void SP_func_door() ============================================================================= */ -void fd_secret_move1(); -void fd_secret_move2(); -void fd_secret_move3(); -void fd_secret_move4(); -void fd_secret_move5(); -void fd_secret_move6(); -void fd_secret_done(); +void fd_secret_move1(void); +void fd_secret_move2(void); +void fd_secret_move3(void); +void fd_secret_move4(void); +void fd_secret_move5(void); +void fd_secret_move6(void); +void fd_secret_done(void); #define SECRET_OPEN_ONCE 1 // stays open #define SECRET_1ST_LEFT 2 // 1st move is left of arrow @@ -850,7 +850,7 @@ void fd_secret_use(gedict_t *attacker, float take) } // Wait after first movement... -void fd_secret_move1() +void fd_secret_move1(void) { self->s.v.nextthink = self->s.v.ltime + 1.0; self->think = (func_t) fd_secret_move2; @@ -858,14 +858,14 @@ void fd_secret_move1() } // Start moving sideways w/sound... -void fd_secret_move2() +void fd_secret_move2(void) { sound(self, CHAN_VOICE, self->noise2, 1, ATTN_NORM); SUB_CalcMove(self->dest2, self->speed, fd_secret_move3); } // Wait here until time to go back... -void fd_secret_move3() +void fd_secret_move3(void) { sound(self, CHAN_VOICE, self->noise3, 1, ATTN_NORM); if (!((int)(self->s.v.spawnflags) & SECRET_OPEN_ONCE)) @@ -876,40 +876,40 @@ void fd_secret_move3() } // Move backward... -void fd_secret_move4() +void fd_secret_move4(void) { sound(self, CHAN_VOICE, self->noise2, 1, ATTN_NORM); SUB_CalcMove(self->dest1, self->speed, fd_secret_move5); } // Wait 1 second... -void fd_secret_move5() +void fd_secret_move5(void) { self->s.v.nextthink = self->s.v.ltime + 1.0; self->think = (func_t) fd_secret_move6; sound(self, CHAN_VOICE, self->noise3, 1, ATTN_NORM); } -void fd_secret_move6() +void fd_secret_move6(void) { sound(self, CHAN_VOICE, self->noise2, 1, ATTN_NORM); SUB_CalcMove(self->s.v.oldorigin, self->speed, fd_secret_done); } -void fd_secret_done() +void fd_secret_done(void) { if (!self->targetname || ((int)(self->s.v.spawnflags) & SECRET_YES_SHOOT)) { self->s.v.health = 10000; self->s.v.takedamage = DAMAGE_YES; self->th_pain = fd_secret_use; - self->th_die = (void (*)()) fd_secret_use; + self->th_die = (void (*)(void)) fd_secret_use; } sound(self, CHAN_NO_PHS_ADD + CHAN_VOICE, self->noise3, 1, ATTN_NORM); } -void secret_blocked() +void secret_blocked(void) { if (g_globalvars.time < self->attack_finished) { @@ -936,7 +936,7 @@ void secret_blocked() Prints messages ================ */ -void secret_touch() +void secret_touch(void) { // return if countdown or map frozen if (!k_practice) // #practice mode# @@ -983,7 +983,7 @@ void secret_touch() 3) base */ -void SP_func_door_secret() +void SP_func_door_secret(void) { if (self->s.v.sounds == 0) { diff --git a/src/func_bob.c b/src/func_bob.c index 751e481b..a03d2521 100644 --- a/src/func_bob.c +++ b/src/func_bob.c @@ -12,7 +12,7 @@ #define FUNC_BOB_NONSOLID 1 #define FUNC_BOB_START_ON 2 -static void func_bob_timer() +static void func_bob_timer(void) { vec3_t delta; @@ -54,7 +54,7 @@ static void func_bob_timer() self->s.v.nextthink = self->s.v.ltime + 0.1f; } -void SP_func_bob() +void SP_func_bob(void) { // Non-solid bobs not implemented yet, remove for now to not block player. if ((int) self->s.v.spawnflags & (BOB_NONSOLID | FUNC_BOB_NONSOLID)) { diff --git a/src/func_laser.c b/src/func_laser.c index 2009b162..7ddd2203 100644 --- a/src/func_laser.c +++ b/src/func_laser.c @@ -3,7 +3,7 @@ #define START_OFF 1 #define LASER_SOLID 2 -static void laser_helper_think() +static void laser_helper_think(void) { gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); float alpha = trap_GetExtField_f(self, "alpha"); @@ -16,7 +16,7 @@ static void laser_helper_think() self->s.v.nextthink = g_globalvars.time + 0.05f; } -static void init_laser_noise() +static void init_laser_noise(void) { gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); @@ -26,7 +26,7 @@ static void init_laser_noise() self->s.v.nextthink = g_globalvars.time + 0.05f; } -static void func_laser_touch() +static void func_laser_touch(void) { // from Copper -- dumptruck_ds if (other->s.v.movetype == MOVETYPE_NOCLIP) @@ -43,7 +43,7 @@ static void func_laser_touch() } } -static void func_laser_use() +static void func_laser_use(void) { if ((int) self->s.v.spawnflags & START_OFF) { @@ -70,7 +70,7 @@ static void func_laser_use() * "message" message to display when activated (not supported) * "message2" message to display when deactivated (not supported) */ -void SP_func_laser() +void SP_func_laser(void) { gedict_t *helper; float alpha; diff --git a/src/g_cmd.c b/src/g_cmd.c index 590995a5..3f4959d8 100644 --- a/src/g_cmd.c +++ b/src/g_cmd.c @@ -25,22 +25,22 @@ #include "g_local.h" -void cmdinfo(); -void cmduinfo(); +void cmdinfo(void); +void cmduinfo(void); void cmd_wreg_do(byte c); -void cmd_ack(); -void cmd_al(); +void cmd_ack(void); +void cmd_al(void); void s_common(gedict_t *from, gedict_t *to, char *msg); -void s_p(); +void s_p(void); void s_lr(float l); void s_t_do(char *str, char *tname); -void s_t(); +void s_t(void); void s_m_do(char *str, int m); // do multi print -void s_m(); +void s_m(void); void multi_do(int from_arg, qbool from_mmode); // set up multi set -qbool ClientCommand() +qbool ClientCommand(void) { char cmd_command[1024]; @@ -93,7 +93,7 @@ qbool ClientCommand() return false; } -void cmd_ack() +void cmd_ack(void) { int argc = trap_CmdArgc(); char arg_1[64]; @@ -156,7 +156,7 @@ say_fp_level_t say_fp_levels[] = int say_fp_levels_cnt = sizeof(say_fp_levels) / sizeof(say_fp_levels[0]); -void FixSayFloodProtect() +void FixSayFloodProtect(void) { static int k_fp_last = -1; @@ -598,7 +598,7 @@ void s_common(gedict_t *from, gedict_t *to, char *msg) G_sprint_flags(from, PRINT_CHAT, SPRINT_IGNOREINDEMO, "[->%s]: %s\n", getname(to), msg); } -void s_p() +void s_p(void) { int argc = trap_CmdArgc(); gedict_t *p; @@ -736,7 +736,7 @@ void s_t_do(char *str, char *tname) G_sprint(self, PRINT_CHAT, "[]: %s\n", tname, str); } -void s_t() +void s_t(void) { int argc = trap_CmdArgc(); char arg_3[1024], *str; @@ -812,7 +812,7 @@ void s_m_do(char *str, int m) G_sprint(self, PRINT_CHAT, "[]: %s\n", m, str); } -void s_m() +void s_m(void) { if (trap_CmdArgc() < 3) { @@ -825,12 +825,12 @@ void s_m() } // "/multi" -void multi() +void multi(void) { multi_do(1, false); } -void multi_usage() +void multi_usage(void) { G_sprint(self, 2, "Usage: multi <=/+/-/\?/\?\?> id1/name1 id2/name2 ...\n"); } @@ -1040,7 +1040,7 @@ void multi_do(int from_arg, qbool from_mmode) } } -void mmode_usage() +void mmode_usage(void) { G_sprint(self, 2, "Usage: mmode [params]\n"); } @@ -1089,7 +1089,7 @@ char* mmode_str(int mmode) return "unknown"; } -void mmode() +void mmode(void) { qbool set; gedict_t *p = NULL; diff --git a/src/g_main.c b/src/g_main.c index c9c07dbc..f697d954 100644 --- a/src/g_main.c +++ b/src/g_main.c @@ -90,20 +90,20 @@ float starttime; int g_matchstarttime; int sv_extensions; void G_InitGame(int levelTime, int randomSeed); -void G_ShutDown(); +void G_ShutDown(void); void StartFrame(int time); -qbool ClientCommand(); +qbool ClientCommand(void); qbool ClientUserInfoChanged(int after); -void G_EdictTouch(); -void G_EdictThink(); -void G_EdictBlocked(); -void ClearGlobals(); +void G_EdictTouch(void); +void G_EdictThink(void); +void G_EdictBlocked(void); +void ClearGlobals(void); void PausedTic(int duration); qbool ClientSay(qbool isTeamSay); -void RemoveMOTD(); -void ShowVersion(); +void RemoveMOTD(void); +void ShowVersion(void); static qbool check_ezquake(gedict_t *p); @@ -498,7 +498,7 @@ void G_InitGame(int levelTime, int randomSeed) sv_extensions = cvar("sv_mod_extensions"); } -void G_ShutDown() +void G_ShutDown(void) { extern int IsMapInCycle(char *map); extern qbool force_map_reset; @@ -531,7 +531,7 @@ void G_ShutDown() // self // other /////////////// -void G_EdictTouch() +void G_EdictTouch(void) { self = PROG_TO_EDICT(g_globalvars.self); other = PROG_TO_EDICT(g_globalvars.other); @@ -544,7 +544,7 @@ void G_EdictTouch() G_bprint(2, "touch %s <-> %s\n", self->classname,other->classname); #endif */ - ((void(*)())(self->touch))(); + ((void(*)(void))(self->touch))(); } else { @@ -558,13 +558,13 @@ void G_EdictTouch() // self // other=world /////////////// -void G_EdictThink() +void G_EdictThink(void) { self = PROG_TO_EDICT(g_globalvars.self); other = PROG_TO_EDICT(g_globalvars.other); if (self->think) { - ((void(*)())(self->think))(); + ((void(*)(void))(self->think))(); } else { @@ -581,14 +581,14 @@ void G_EdictThink() // if the pusher has a "blocked" function, call it // otherwise, just stay in place until the obstacle is gone /////////////// -void G_EdictBlocked() +void G_EdictBlocked(void) { self = PROG_TO_EDICT(g_globalvars.self); other = PROG_TO_EDICT(g_globalvars.other); if (self->blocked) { - ((void(*)())(self->blocked))(); + ((void(*)(void))(self->blocked))(); } else { @@ -597,7 +597,7 @@ void G_EdictBlocked() } -void ClearGlobals() +void ClearGlobals(void) { damage_attacker = damage_inflictor = activator = self = other = newmis = world; } diff --git a/src/g_spawn.c b/src/g_spawn.c index c4c70886..491fdea8 100644 --- a/src/g_spawn.c +++ b/src/g_spawn.c @@ -184,10 +184,10 @@ field_t fields[] = typedef struct { char *name; - void (*spawn)(); + void (*spawn)(void); } spawn_t; -void SUB_Remove() +void SUB_Remove(void) { // if (self && self->classname ) // G_bprint(2, "rm: %s\n", self->classname); @@ -213,138 +213,138 @@ void SUB_RM_01(gedict_t *ent) } } -void SUB_Null() +void SUB_Null(void) { } -void SP_light(); -void SP_light_fluoro(); -void SP_light_fluorospark(); -void SP_light_globe(); -void SP_light_torch_small_walltorch(); -void SP_light_flame_large_yellow(); -void SP_light_flame_small_yellow(); -void SP_light_flame_small_white(); - -void SP_ambient_suck_wind(); -void SP_ambient_drone(); -void SP_ambient_flouro_buzz(); -void SP_ambient_drip(); -void SP_ambient_comp_hum(); -void SP_ambient_thunder(); -void SP_ambient_light_buzz(); -void SP_ambient_swamp1(); -void SP_ambient_swamp2(); -void SP_misc_noisemaker(); -void SP_misc_explobox(); -void SP_misc_explobox2(); -void SP_air_bubbles(); - -void SP_trap_spikeshooter(); -void SP_trap_shooter(); -void SP_func_wall(); -void SP_func_ctf_wall(); -void SP_func_illusionary(); -void SP_func_episodegate(); -void SP_func_bossgate(); - -void SP_func_door(); -void SP_func_door_secret(); -void SP_func_plat(); -void SP_func_train(); -void SP_misc_teleporttrain(); -void SP_func_button(); - -void SP_func_bob(); -void SP_func_laser(); - -void SP_trigger_multiple(); -void SP_trigger_once(); -void SP_trigger_relay(); -void SP_trigger_secret(); -void SP_trigger_counter(); -void SP_info_teleport_destination(); -void SP_trigger_teleport(); -void SP_trigger_custom_teleport(); -void SP_trigger_setskill(); -void SP_trigger_onlyregistered(); -void SP_trigger_hurt(); -void SP_trigger_push(); -void SP_trigger_custom_push(); -void SP_trigger_monsterjump(); -void SP_trigger_custom_monsterjump(); -void SP_trigger_changelevel(); -void SP_path_corner(); - -void SP_item_health(); -void SP_item_armor1(); -void SP_item_armor2(); -void SP_item_armorInv(); -void SP_weapon_supershotgun(); -void SP_weapon_nailgun(); -void SP_weapon_supernailgun(); -void SP_weapon_grenadelauncher(); -void SP_weapon_rocketlauncher(); -void SP_weapon_lightning(); -void SP_item_shells(); -void SP_item_spikes(); -void SP_item_rockets(); -void SP_item_cells(); -void SP_item_weapon(); - -void SP_item_artifact_invulnerability(); -void SP_item_artifact_envirosuit(); -void SP_item_artifact_invisibility(); -void SP_item_artifact_super_damage(); -void SP_item_flag_team1(); -void SP_item_flag_team2(); -void SP_item_sigil(); -void SP_item_key1(); -void SP_item_key2(); - -void SP_misc_fireball(); -void SP_info_intermission(); -void SP_info_player_deathmatch(); - -void SP_monster_dog(); -void SP_monster_demon1(); -void SP_monster_enforcer(); -void SP_monster_fish(); -void SP_monster_hell_knight(); -void SP_monster_knight(); -void SP_monster_ogre(); -void SP_monster_shalrath(); -void SP_monster_shambler(); -void SP_monster_army(); -void SP_monster_tarbaby(); -void SP_monster_wizard(); -void SP_monster_zombie(); -void SP_monster_boss(); -void SP_monster_oldone(); -void SP_event_lightning(); - -void SP_info_monster_start(); +void SP_light(void); +void SP_light_fluoro(void); +void SP_light_fluorospark(void); +void SP_light_globe(void); +void SP_light_torch_small_walltorch(void); +void SP_light_flame_large_yellow(void); +void SP_light_flame_small_yellow(void); +void SP_light_flame_small_white(void); + +void SP_ambient_suck_wind(void); +void SP_ambient_drone(void); +void SP_ambient_flouro_buzz(void); +void SP_ambient_drip(void); +void SP_ambient_comp_hum(void); +void SP_ambient_thunder(void); +void SP_ambient_light_buzz(void); +void SP_ambient_swamp1(void); +void SP_ambient_swamp2(void); +void SP_misc_noisemaker(void); +void SP_misc_explobox(void); +void SP_misc_explobox2(void); +void SP_air_bubbles(void); + +void SP_trap_spikeshooter(void); +void SP_trap_shooter(void); +void SP_func_wall(void); +void SP_func_ctf_wall(void); +void SP_func_illusionary(void); +void SP_func_episodegate(void); +void SP_func_bossgate(void); + +void SP_func_door(void); +void SP_func_door_secret(void); +void SP_func_plat(void); +void SP_func_train(void); +void SP_misc_teleporttrain(void); +void SP_func_button(void); + +void SP_func_bob(void); +void SP_func_laser(void); + +void SP_trigger_multiple(void); +void SP_trigger_once(void); +void SP_trigger_relay(void); +void SP_trigger_secret(void); +void SP_trigger_counter(void); +void SP_info_teleport_destination(void); +void SP_trigger_teleport(void); +void SP_trigger_custom_teleport(void); +void SP_trigger_setskill(void); +void SP_trigger_onlyregistered(void); +void SP_trigger_hurt(void); +void SP_trigger_push(void); +void SP_trigger_custom_push(void); +void SP_trigger_monsterjump(void); +void SP_trigger_custom_monsterjump(void); +void SP_trigger_changelevel(void); +void SP_path_corner(void); + +void SP_item_health(void); +void SP_item_armor1(void); +void SP_item_armor2(void); +void SP_item_armorInv(void); +void SP_weapon_supershotgun(void); +void SP_weapon_nailgun(void); +void SP_weapon_supernailgun(void); +void SP_weapon_grenadelauncher(void); +void SP_weapon_rocketlauncher(void); +void SP_weapon_lightning(void); +void SP_item_shells(void); +void SP_item_spikes(void); +void SP_item_rockets(void); +void SP_item_cells(void); +void SP_item_weapon(void); + +void SP_item_artifact_invulnerability(void); +void SP_item_artifact_envirosuit(void); +void SP_item_artifact_invisibility(void); +void SP_item_artifact_super_damage(void); +void SP_item_flag_team1(void); +void SP_item_flag_team2(void); +void SP_item_sigil(void); +void SP_item_key1(void); +void SP_item_key2(void); + +void SP_misc_fireball(void); +void SP_info_intermission(void); +void SP_info_player_deathmatch(void); + +void SP_monster_dog(void); +void SP_monster_demon1(void); +void SP_monster_enforcer(void); +void SP_monster_fish(void); +void SP_monster_hell_knight(void); +void SP_monster_knight(void); +void SP_monster_ogre(void); +void SP_monster_shalrath(void); +void SP_monster_shambler(void); +void SP_monster_army(void); +void SP_monster_tarbaby(void); +void SP_monster_wizard(void); +void SP_monster_zombie(void); +void SP_monster_boss(void); +void SP_monster_oldone(void); +void SP_event_lightning(void); + +void SP_info_monster_start(void); // TF -void SP_item_tfgoal(); -void SP_info_player_teamspawn(); -void SP_i_p_t(); +void SP_item_tfgoal(void); +void SP_info_player_teamspawn(void); +void SP_i_p_t(void); // Races -void SP_race_route_start(); +void SP_race_route_start(void); // Rotate -void SP_info_rotate(); -void SP_path_rotate(); -void SP_func_rotate_entity(); -void SP_func_rotate_train(); -void SP_func_movewall(); -void SP_rotate_object(); -void SP_func_rotate_door(); +void SP_info_rotate(void); +void SP_path_rotate(void); +void SP_func_rotate_entity(void); +void SP_func_rotate_train(void); +void SP_func_movewall(void); +void SP_rotate_object(void); +void SP_func_rotate_door(void); -void SP_ambient_general(); +void SP_ambient_general(void); -void SP_trigger_heal(); +void SP_trigger_heal(void); spawn_t spawns[] = { @@ -813,7 +813,7 @@ qbool G_ParseSpawnVars(void) return true; } -void SP_worldspawn(); +void SP_worldspawn(void); /* ============== @@ -841,7 +841,7 @@ void G_SpawnEntitiesFromString(void) G_ParseField(spawnVars[i][0], spawnVars[i][1], world); } - SP_worldspawn(world); + SP_worldspawn(); // parse ents diff --git a/src/g_syscalls.c b/src/g_syscalls.c index 3705efb6..8a4ea096 100644 --- a/src/g_syscalls.c +++ b/src/g_syscalls.c @@ -55,7 +55,7 @@ static intptr_t PASSFLOAT(float x) return rc._int; } -intptr_t trap_GetApiVersion() +intptr_t trap_GetApiVersion(void) { return syscall(G_GETAPIVERSION); } @@ -95,7 +95,7 @@ void trap_Error(const char *fmt) syscall(G_ERROR, (intptr_t) fmt); } -intptr_t trap_spawn() +intptr_t trap_spawn(void) { return syscall(G_SPAWN_ENT); } @@ -146,7 +146,7 @@ void trap_sound(intptr_t edn, intptr_t channel, char *samp, float vol, float att syscall(G_SOUND, edn, channel, (intptr_t) samp, PASSFLOAT(vol), PASSFLOAT(att)); } -intptr_t trap_checkclient() +intptr_t trap_checkclient(void) { return syscall(G_CHECKCLIENT); } @@ -168,7 +168,7 @@ void trap_localcmd(const char *fmt) syscall(G_LOCALCMD, (intptr_t) fmt); } -void trap_executecmd() +void trap_executecmd(void) { syscall(G_executecmd); } @@ -331,7 +331,7 @@ void trap_WriteEntity(intptr_t to, intptr_t edn) syscall(G_WRITEENTITY, to, edn); } -void trap_FlushSignon() +void trap_FlushSignon(void) { syscall(G_FLUSHSIGNON); } @@ -341,7 +341,7 @@ void trap_disableupdates(intptr_t edn, float time) syscall(G_DISABLEUPDATES, edn, PASSFLOAT(time)); } -intptr_t trap_CmdArgc() +intptr_t trap_CmdArgc(void) { return syscall(G_CMD_ARGC); } diff --git a/src/g_userinfo.c b/src/g_userinfo.c index 2df847d0..087a8237 100644 --- a/src/g_userinfo.c +++ b/src/g_userinfo.c @@ -83,7 +83,7 @@ cmdinfo_t cinfos[] = int cinfos_cnt = sizeof(cinfos) / sizeof(cinfos[0]); -void cmdinfo() +void cmdinfo(void) { int argc = trap_CmdArgc(); char arg_1[128], arg_2[128]; @@ -121,7 +121,7 @@ void cmdinfo() } } -void cmduinfo() +void cmduinfo(void) { gedict_t *p; int argc = trap_CmdArgc(); diff --git a/src/g_utils.c b/src/g_utils.c index c3bd1d11..339cd623 100644 --- a/src/g_utils.c +++ b/src/g_utils.c @@ -48,12 +48,12 @@ void g_random_seed(int seed) { rng_seed_global(seed); } -float g_random() +float g_random(void) { return (rng_next_global() >> 8 & 0xffffff) / 16777216.0f; } -float crandom() +float crandom(void) { return (2 * (g_random() - 0.5)); } @@ -127,12 +127,12 @@ void initialise_spawned_ent(gedict_t *ent) #endif } -float next_frame() +float next_frame(void) { return g_globalvars.time + g_globalvars.frametime; } -gedict_t* spawn() +gedict_t* spawn(void) { gedict_t *t = &g_edicts[trap_spawn()]; @@ -932,7 +932,7 @@ void sound(gedict_t *ed, int channel, char *samp, float vol, float att) trap_sound(NUM_FOR_EDICT(ed), channel, samp, vol, att); } -gedict_t* checkclient() +gedict_t* checkclient(void) { return &g_edicts[trap_checkclient()]; } @@ -1573,27 +1573,27 @@ qbool isghost(gedict_t *ed) return (streq(ed->classname, "ghost") ? true : false); } // gametype >>> -qbool isDuel() +qbool isDuel(void) { return ((k_mode == gtDuel) ? true : false); } -qbool isTeam() +qbool isTeam(void) { return ((k_mode == gtTeam) ? true : false); } -int tp_num() +int tp_num(void) { return ((isTeam() || isCTF() || coop) ? teamplay : 0); } -qbool isFFA() +qbool isFFA(void) { return ((k_mode == gtFFA) ? true : false); } -qbool isCTF() +qbool isCTF(void) { #ifdef CTF_RELOADMAP return k_ctf; // once setup at map load @@ -1602,7 +1602,7 @@ qbool isCTF() #endif } -qbool isUnknown() +qbool isUnknown(void) { #ifdef CTF_RELOADMAP if (cvar("k_mode") == gtCTF) @@ -1777,7 +1777,7 @@ char* Get_PowerupsStr(void) return str; } -int Get_Powerups() +int Get_Powerups(void) { static float k_pow_check = 0; static int k_pow = 0; @@ -1865,7 +1865,7 @@ int k_scores3 = 0; gedict_t *ed_scores1 = NULL; gedict_t *ed_scores2 = NULL; -void ReScores() +void ReScores(void) { gedict_t *p; int from; @@ -1954,35 +1954,35 @@ void ReScores() } } -int get_scores1() +int get_scores1(void) { ReScores(); return k_scores1; } -int get_scores2() +int get_scores2(void) { ReScores(); return k_scores2; } -int get_scores3() +int get_scores3(void) { ReScores(); return k_scores3; } -gedict_t* get_ed_scores1() +gedict_t* get_ed_scores1(void) { ReScores(); return ed_scores1; } -gedict_t* get_ed_scores2() +gedict_t* get_ed_scores2(void) { ReScores(); @@ -1997,7 +1997,7 @@ gedict_t *ed_best1 = NULL; gedict_t *ed_best2 = NULL; gedict_t *ed_bestPow = NULL; -void CalculateBestPlayers() +void CalculateBestPlayers(void) { gedict_t *p; int best, best1, best2; @@ -2073,7 +2073,7 @@ void CalculateBestPlayers() } } -void CalculateBestPowPlayers() +void CalculateBestPowPlayers(void) { gedict_t *p; int best, best1; @@ -2124,21 +2124,21 @@ void CalculateBestPowPlayers() } } -gedict_t* get_ed_best1() +gedict_t* get_ed_best1(void) { CalculateBestPlayers(); return ed_best1; } -gedict_t* get_ed_best2() +gedict_t* get_ed_best2(void) { CalculateBestPlayers(); return ed_best2; } -gedict_t* get_ed_bestPow() +gedict_t* get_ed_bestPow(void) { CalculateBestPowPlayers(); @@ -2354,7 +2354,7 @@ void ghost2scores(gedict_t *g) WriteShort(to, 39); // client ping } -void update_ghosts() +void update_ghosts(void) { gedict_t *p; int from; @@ -2369,7 +2369,7 @@ void update_ghosts() // { events -void on_connect() +void on_connect(void) { char *newteam; @@ -2415,7 +2415,7 @@ void on_connect() } } -void on_enter() +void on_enter(void) { if (iKey(self, "kf") & KF_ON_ENTER) // client doesn't want on_enter { @@ -2576,7 +2576,7 @@ void cl_refresh_plus_scores(gedict_t *p) } } -void refresh_plus_scores() +void refresh_plus_scores(void) { gedict_t *p; @@ -2639,7 +2639,7 @@ char* params_str(int from, int to) return string[index++]; } -char* SD_type_str() +char* SD_type_str(void) { switch ((int)k_sudden_death) { @@ -2710,13 +2710,13 @@ char* respawn_model_name_short(int mdl_num) } } -int get_fair_pack() +int get_fair_pack(void) { // Yawnmode: always 2 aka last weapon return bound(0, k_yawnmode ? 2 : cvar("k_frp"), 2); } -int get_fallbunny() +int get_fallbunny(void) { // Yawnmode/race: no broken ankle return (k_yawnmode || isRACE() ? 1 : cvar("k_fallbunny")); diff --git a/src/grapple.c b/src/grapple.c index 7b985b0a..d7ec544a 100644 --- a/src/grapple.c +++ b/src/grapple.c @@ -83,7 +83,7 @@ void GrappleReset(gedict_t *rhook) // a player that is not on the same team as the hook's // owner. // -void GrappleTrack() +void GrappleTrack(void) { gedict_t *enemy = PROG_TO_EDICT(self->s.v.enemy); gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); @@ -141,7 +141,7 @@ void GrappleTrack() // // MakeLink - spawns the chain link entities // -gedict_t* MakeLink() +gedict_t* MakeLink(void) { newmis = spawn(); g_globalvars.newmis = EDICT_TO_PROG(newmis); @@ -171,7 +171,7 @@ gedict_t* MakeLink() // to remove the chain. Only one function required to // remove all links. // -void RemoveChain() +void RemoveChain(void) { self->think = (func_t) SUB_Remove; self->s.v.nextthink = next_frame(); @@ -196,7 +196,7 @@ void RemoveChain() // maintains the positions of all of the links. Only one link // is thinking every frame. // -void UpdateChain() +void UpdateChain(void) { vec3_t t1, t2, t3; vec3_t temp; @@ -273,7 +273,7 @@ void CancelHook(gedict_t *owner) // // BuildChain - Builds the chain (linked list) // -void BuildChain() +void BuildChain(void) { self->s.v.goalentity = EDICT_TO_PROG(MakeLink()); PROG_TO_EDICT(self->s.v.goalentity)->think = (func_t)UpdateChain; @@ -284,7 +284,7 @@ void BuildChain() EDICT_TO_PROG(MakeLink()); } -void GrappleAnchor() +void GrappleAnchor(void) { gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); @@ -365,7 +365,7 @@ void GrappleAnchor() } // Called from client.c -void GrappleService() +void GrappleService(void) { vec3_t hookVector, hookVelocity; gedict_t *enemy; @@ -427,7 +427,7 @@ void GrappleService() } // Called from weapons.c -void GrappleThrow() +void GrappleThrow(void) { float hasteMultiplier, throwSpeed; diff --git a/src/hiprot.c b/src/hiprot.c index 40215227..c007dd56 100644 --- a/src/hiprot.c +++ b/src/hiprot.c @@ -43,7 +43,7 @@ /*QUAKED info_rotate (0 0.5 0) (-4 -4 -4) (4 4 4) Used as the point of rotation for rotatable objects. */ -void SP_info_rotate() +void SP_info_rotate(void) { // remove self after a little while, to make sure that entities that // have targeted it have had a chance to spawn @@ -51,7 +51,7 @@ void SP_info_rotate() self->think = (func_t) SUB_Remove; } -static void RotateTargets() +static void RotateTargets(void) { gedict_t *ent; vec3_t vx, vy, vz, org; @@ -93,7 +93,7 @@ static void RotateTargets() } } -static void RotateTargetsFinal() +static void RotateTargetsFinal(void) { gedict_t *ent; @@ -109,7 +109,7 @@ static void RotateTargetsFinal() } } -static void SetTargetOrigin() +static void SetTargetOrigin(void) { gedict_t *ent; vec3_t org; @@ -133,7 +133,7 @@ static void SetTargetOrigin() } } -static void LinkRotateTargets() +static void LinkRotateTargets(void) { gedict_t *ent; vec3_t tempvec; @@ -218,7 +218,7 @@ static void SUB_NormalizeAngles(vec3_t v) v[2] = (float) fmod(v[2], 360.0); } -static void rotate_entity_think() +static void rotate_entity_think(void) { vec3_t delta; float t; @@ -259,7 +259,7 @@ static void rotate_entity_think() self->s.v.nextthink = g_globalvars.time + 0.02f; } -static void rotate_entity_use() +static void rotate_entity_use(void) { // change to alternate textures self->s.v.frame = 1 - self->s.v.frame; @@ -308,7 +308,7 @@ static void rotate_entity_use() } } -static void rotate_entity_firstthink() +static void rotate_entity_firstthink(void) { LinkRotateTargets(); if ((int) self->s.v.spawnflags & START_ON ) @@ -341,7 +341,7 @@ If "deathtype" is set with a string, this is the message that will appear when a "speed" is how long the entity takes to go from standing still to full speed and vice-versa. */ -void SP_func_rotate_entity() +void SP_func_rotate_entity(void) { self->s.v.solid = SOLID_NOT; self->s.v.movetype = MOVETYPE_NONE; @@ -386,7 +386,7 @@ void SP_func_rotate_entity() "noise1" contains the name of the sound to play when train moves. "event" is a target to trigger when train arrives at path_rotate. */ -void SP_path_rotate() +void SP_path_rotate(void) { if (self->noise) { @@ -399,10 +399,10 @@ void SP_path_rotate() } -static void rotate_train_next(); -static void rotate_train_find(); +static void rotate_train_next(void); +static void rotate_train_find(void); -static void rotate_train_think() +static void rotate_train_think(void) { float t, timeelapsed; vec3_t delta; @@ -445,7 +445,7 @@ static void rotate_train_think() self->s.v.nextthink = g_globalvars.time + 0.02f; } -static void rotate_train_use() +static void rotate_train_use(void) { if (self->think1 != rotate_train_find) { @@ -460,7 +460,7 @@ static void rotate_train_use() } } -static void rotate_train_wait() +static void rotate_train_wait(void) { gedict_t *goalentity = PROG_TO_EDICT(self->s.v.goalentity); self->state = STATE_WAIT; @@ -486,7 +486,7 @@ static void rotate_train_wait() self->think1 = rotate_train_next; } -static void rotate_train_stop() +static void rotate_train_stop(void) { gedict_t *goalentity = PROG_TO_EDICT(self->s.v.goalentity); @@ -514,7 +514,7 @@ static void rotate_train_stop() self->think1 = rotate_train_next; } -static void rotate_train_next() +static void rotate_train_next(void) { gedict_t *targ, *current, *goalentity; vec3_t vdestdelta; @@ -686,7 +686,7 @@ static void rotate_train_next() } } -static void rotate_train_find() +static void rotate_train_find(void) { gedict_t *targ; @@ -761,7 +761,7 @@ sounds 1) ratchet metal */ -void SP_func_rotate_train() +void SP_func_rotate_train(void) { if (!self->speed) { @@ -832,10 +832,10 @@ void SP_func_rotate_train() // //************************************************ -static void rotate_door_reversedirection(); -static void rotate_door_group_reversedirection(); +static void rotate_door_reversedirection(void); +static void rotate_door_group_reversedirection(void); -static void movewall_touch() +static void movewall_touch(void) { gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); @@ -856,7 +856,7 @@ static void movewall_touch() } } -static void movewall_blocked() +static void movewall_blocked(void) { gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); gedict_t *temp; @@ -888,7 +888,7 @@ static void movewall_blocked() } } -static void movewall_think() +static void movewall_think(void) { self->s.v.ltime = g_globalvars.time; self->s.v.nextthink = g_globalvars.time + 0.02f; @@ -905,7 +905,7 @@ NONBLOCKING makes the brush non-solid. This is useless if VISIBLE is set. "dmg" specifies the damage to cause when touched or blocked. */ -void SP_func_movewall() +void SP_func_movewall(void) { SetVector(self->s.v.angles, 0, 0, 0); self->s.v.movetype = MOVETYPE_PUSH; @@ -935,7 +935,7 @@ void SP_func_movewall() /*QUAKED rotate_object (0 .5 .8) ? This defines an object to be rotated. Used as the target of func_rotate_door. */ -void SP_rotate_object() +void SP_rotate_object(void) { self->classname = "rotate_object"; self->s.v.solid = SOLID_NOT; @@ -951,7 +951,7 @@ void SP_rotate_object() // //************************************************ -static void rotate_door_think2() +static void rotate_door_think2(void) { self->s.v.ltime = g_globalvars.time; @@ -980,7 +980,7 @@ static void rotate_door_think2() RotateTargetsFinal(); } -static void rotate_door_think() +static void rotate_door_think(void) { float t; vec3_t delta; @@ -1004,7 +1004,7 @@ static void rotate_door_think() self->s.v.nextthink = g_globalvars.time + 0.01f; } -static void rotate_door_reversedirection() +static void rotate_door_reversedirection(void) { vec3_t start; @@ -1035,7 +1035,7 @@ static void rotate_door_reversedirection() self->s.v.ltime = g_globalvars.time; } -static void rotate_door_group_reversedirection() +static void rotate_door_group_reversedirection(void) { char *name; @@ -1056,7 +1056,7 @@ static void rotate_door_group_reversedirection() } } -static void rotate_door_use() +static void rotate_door_use(void) { vec3_t start; @@ -1114,7 +1114,7 @@ once door from closing again when it's blocked. 3) base */ -void SP_func_rotate_door() +void SP_func_rotate_door(void) { if (strnull(self->target)) { diff --git a/src/items.c b/src/items.c index 87363570..79078b08 100644 --- a/src/items.c +++ b/src/items.c @@ -25,9 +25,9 @@ #include "g_local.h" -void SP_item_artifact_invisibility(); -void SP_item_artifact_super_damage(); -void SP_item_artifact_invulnerability(); +void SP_item_artifact_invisibility(void); +void SP_item_artifact_super_damage(void); +void SP_item_artifact_invulnerability(void); void TookWeaponHandler(gedict_t *p, int new_wp, qbool from_backpack); void BotsBackpackTouchedNonPlayer(gedict_t *backpack, gedict_t *entity); @@ -56,7 +56,7 @@ static void ItemTaken(gedict_t *item, gedict_t *player) #endif } -void SUB_regen() +void SUB_regen(void) { if (!deathmatch && (skill < 3)) { @@ -76,7 +76,7 @@ void SUB_regen() #endif } -void SUB_regen_powerups() +void SUB_regen_powerups(void) { extern void ktpro_autotrack_predict_powerup(void); @@ -87,7 +87,7 @@ void SUB_regen_powerups() self->s.v.nextthink = g_globalvars.time + AUTOTRACK_POWERUPS_PREDICT_TIME; } -void PlaceItem() +void PlaceItem(void) { self->s.v.solid = SOLID_TRIGGER; self->s.v.movetype = MOVETYPE_TOSS; @@ -127,7 +127,7 @@ void PlaceItem() used for dropable powerups. ============ */ -void PlaceItemIngame() +void PlaceItemIngame(void) { self->s.v.solid = SOLID_TRIGGER; self->s.v.movetype = MOVETYPE_TOSS; @@ -150,7 +150,7 @@ void PlaceItemIngame() Sets the clipping size and plants the object on the floor ============ */ -void StartItem() +void StartItem(void) { // G_bprint(2, "StartItem: %s\n", self->classname); @@ -226,7 +226,7 @@ float T_Heal(gedict_t *e, float healamount, float ignore) return 1; } -void health_touch(); +void health_touch(void); void item_megahealth_rot(void); /*QUAKED item_health (.3 .3 1) (0 0 0) (32 32 32) rotten megahealth @@ -237,7 +237,7 @@ void item_megahealth_rot(void); one point per second. */ -void SP_item_health() +void SP_item_health(void) { self->touch = (func_t) health_touch; self->tp_flags = it_health; @@ -269,7 +269,7 @@ void SP_item_health() StartItem(); } -void health_touch() +void health_touch(void) { if (other->ct != ctPlayer) { @@ -422,7 +422,7 @@ void item_megahealth_rot(void) =============================================================================== */ -void armor_touch() +void armor_touch(void) { float type = 0; float value = 0; @@ -579,7 +579,7 @@ void armor_touch() /*QUAKED item_armor1 (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_item_armor1() +void SP_item_armor1(void) { self->touch = (func_t) armor_touch; setmodel(self, "progs/armor.mdl"); @@ -593,7 +593,7 @@ void SP_item_armor1() /*QUAKED item_armor2 (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_item_armor2() +void SP_item_armor2(void) { self->touch = (func_t) armor_touch; setmodel(self, "progs/armor.mdl"); @@ -607,7 +607,7 @@ void SP_item_armor2() /*QUAKED item_armorInv (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_item_armorInv() +void SP_item_armorInv(void) { self->touch = (func_t) armor_touch; setmodel(self, "progs/armor.mdl"); @@ -626,7 +626,7 @@ void SP_item_armorInv() =============================================================================== */ -void bound_other_ammo() +void bound_other_ammo(void) { if (other->s.v.ammo_shells > 100) { @@ -794,9 +794,9 @@ void DoWeaponChange(int new, qbool backpack) weapon_touch ============= */ -float W_BestWeapon(); +float W_BestWeapon(void); -void weapon_touch() +void weapon_touch(void) { int hadammo = 0, new = 0; gedict_t *stemp; @@ -1060,7 +1060,7 @@ void weapon_touch() /*QUAKED weapon_supershotgun (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_weapon_supershotgun() +void SP_weapon_supershotgun(void) { setmodel(self, "progs/g_shot.mdl"); @@ -1077,7 +1077,7 @@ void SP_weapon_supershotgun() /*QUAKED weapon_nailgun (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_weapon_nailgun() +void SP_weapon_nailgun(void) { setmodel(self, "progs/g_nail.mdl"); @@ -1094,7 +1094,7 @@ void SP_weapon_nailgun() /*QUAKED weapon_supernailgun (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_weapon_supernailgun() +void SP_weapon_supernailgun(void) { setmodel(self, "progs/g_nail2.mdl"); @@ -1112,7 +1112,7 @@ void SP_weapon_supernailgun() /*QUAKED weapon_grenadelauncher (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_weapon_grenadelauncher() +void SP_weapon_grenadelauncher(void) { setmodel(self, "progs/g_rock.mdl"); @@ -1129,7 +1129,7 @@ void SP_weapon_grenadelauncher() /*QUAKED weapon_rocketlauncher (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_weapon_rocketlauncher() +void SP_weapon_rocketlauncher(void) { setmodel(self, "progs/g_rock2.mdl"); @@ -1146,7 +1146,7 @@ void SP_weapon_rocketlauncher() /*QUAKED weapon_lightning (0 .5 .8) (-16 -16 0) (16 16 32) */ -void SP_weapon_lightning() +void SP_weapon_lightning(void) { setmodel(self, "progs/g_light.mdl"); @@ -1168,7 +1168,7 @@ void SP_weapon_lightning() =============================================================================== */ -void ammo_touch() +void ammo_touch(void) { int ammo, weapon, best; int real_ammo = 0; @@ -1343,7 +1343,7 @@ void ammo_touch() /*QUAKED item_shells (0 .5 .8) (0 0 0) (32 32 32) big */ -void SP_item_shells() +void SP_item_shells(void) { self->touch = (func_t) ammo_touch; @@ -1370,7 +1370,7 @@ void SP_item_shells() /*QUAKED item_spikes (0 .5 .8) (0 0 0) (32 32 32) big */ -void SP_item_spikes() +void SP_item_spikes(void) { qbool old_style = streq(self->classname, "item_weapon"); @@ -1399,7 +1399,7 @@ void SP_item_spikes() /*QUAKED item_rockets (0 .5 .8) (0 0 0) (32 32 32) big */ -void SP_item_rockets() +void SP_item_rockets(void) { self->touch = (func_t) ammo_touch; @@ -1426,7 +1426,7 @@ void SP_item_rockets() /*QUAKED item_cells (0 .5 .8) (0 0 0) (32 32 32) big */ -void SP_item_cells() +void SP_item_cells(void) { self->touch = (func_t) ammo_touch; @@ -1458,7 +1458,7 @@ void SP_item_cells() #define WEAPON_ROCKET 2 #define WEAPON_SPIKES 4 #define WEAPON_BIG 8 -void SP_item_weapon() +void SP_item_weapon(void) { if ((int)(self->s.v.spawnflags) & WEAPON_SHOTGUN) { @@ -1494,7 +1494,7 @@ void SP_item_weapon() =============================================================================== */ -void key_touch() +void key_touch(void) { //gedict_t* stemp; //float best; @@ -1555,7 +1555,7 @@ void key_touch() SUB_UseTargets(); // fire all targets / killtargets } -void key_setsounds() +void key_setsounds(void) { if (world->worldtype == 0) { @@ -1587,7 +1587,7 @@ void key_setsounds() 2: base */ -void SP_item_key1() +void SP_item_key1(void) { if (world->worldtype == 0) { @@ -1626,7 +1626,7 @@ void SP_item_key1() 2: base */ -void SP_item_key2() +void SP_item_key2(void) { if (world->worldtype == 0) { @@ -1663,7 +1663,7 @@ void SP_item_key2() =============================================================================== */ -void sigil_touch() +void sigil_touch(void) { //gedict_t* stemp; //float best; @@ -1721,7 +1721,7 @@ void sigil_touch() End of level sigil, pick up to end episode and return to jrstart. */ -void SP_item_sigil() +void SP_item_sigil(void) { if (!(int)(self->s.v.spawnflags)) { @@ -1837,7 +1837,7 @@ void show_powerups(char *classname) } } -static void KillQuadThink() +static void KillQuadThink(void) { ent_remove(self); } @@ -1945,7 +1945,7 @@ static qbool NeedDropQuad(void) return !ez_find(world, "item_artifact_super_damage"); } -void DropPowerups() +void DropPowerups(void) { if ((k_killquad || (cvar("dq") && Get_Powerups() && cvar("k_pow_q"))) && !k_berzerk) { @@ -1971,7 +1971,7 @@ void DropPowerups() } } -void powerup_touch() +void powerup_touch(void) { float *p_cnt = NULL; float real_time = 30; @@ -2228,7 +2228,7 @@ void powerup_touch() /*QUAKED item_artifact_invulnerability (0 .5 .8) (-16 -16 -24) (16 16 32) Player is invulnerable for 30 seconds */ -void SP_item_artifact_invulnerability() +void SP_item_artifact_invulnerability(void) { qbool b_dp = self->cnt > g_globalvars.time; // dropped powerup by player, not normal spawn @@ -2258,7 +2258,7 @@ void SP_item_artifact_invulnerability() /*QUAKED item_artifact_envirosuit (0 .5 .8) (-16 -16 -24) (16 16 32) Player takes no damage from water or slime for 30 seconds */ -void SP_item_artifact_envirosuit() +void SP_item_artifact_envirosuit(void) { self->touch = (func_t) powerup_touch; @@ -2278,7 +2278,7 @@ void SP_item_artifact_envirosuit() /*QUAKED item_artifact_invisibility (0 .5 .8) (-16 -16 -24) (16 16 32) Player is invisible for 30 seconds */ -void SP_item_artifact_invisibility() +void SP_item_artifact_invisibility(void) { qbool b_dp = self->cnt > g_globalvars.time; // dropped powerup by player, not normal spawn @@ -2305,7 +2305,7 @@ void SP_item_artifact_invisibility() /*QUAKED item_artifact_super_damage (0 .5 .8) (-16 -16 -24) (16 16 32) The next attack from the player will do 4x damage */ -void SP_item_artifact_super_damage() +void SP_item_artifact_super_damage(void) { qbool b_dp = self->cnt > g_globalvars.time; // dropped powerup by player, not normal spawn @@ -2340,7 +2340,7 @@ void SP_item_artifact_super_damage() =============================================================================== */ -void BackpackTouch() +void BackpackTouch(void) { int new; gedict_t *stemp, *p; @@ -2640,7 +2640,7 @@ void BackpackTouch() #define IT_DROPPABLE_WEAPONS (IT_SUPER_SHOTGUN|IT_NAILGUN|IT_SUPER_NAILGUN|IT_GRENADE_LAUNCHER|IT_ROCKET_LAUNCHER|IT_LIGHTNING) -void DropBackpack() +void DropBackpack(void) { gedict_t *item; float f1; @@ -2914,7 +2914,7 @@ void Spawn_SpawnPoints(char *classname, int effects) } } -void ShowSpawnPoints() +void ShowSpawnPoints(void) { Spawn_SpawnPoints("info_player_deathmatch", cvar("k_spm_glow") ? ( EF_GREEN | EF_RED) : 0); @@ -2925,7 +2925,7 @@ void ShowSpawnPoints() } } -void HideSpawnPoints() +void HideSpawnPoints(void) { gedict_t *e; diff --git a/src/logs.c b/src/logs.c index 60530da9..bdae4cb9 100644 --- a/src/logs.c +++ b/src/logs.c @@ -90,7 +90,7 @@ void log_printf(const char *fmt, ...) trap_FS_WriteFile(text, strlen(text), log_handle); } -void StartLogs() +void StartLogs(void) { char date[64] = { 0 }, date_c[64] = @@ -136,7 +136,7 @@ void StartLogs() log_printf("\t\n"); } -void StopLogs() +void StopLogs(void) { log_printf("\t\n"); log_printf("\n"); diff --git a/src/maps.c b/src/maps.c index 1120a1e2..340bbedb 100644 --- a/src/maps.c +++ b/src/maps.c @@ -241,7 +241,7 @@ void GetMapList(void) #endif } -void mapslist_dl() +void mapslist_dl(void) { char arg_2[32]; char nomaps[32]; @@ -474,7 +474,7 @@ void DoSelectMap(int iMap) vote_check_map(); } -void SelectMap() +void SelectMap(void) { char arg_1[1024]; @@ -500,7 +500,7 @@ qbool VoteMapSpecific(char *map) return true; } -void VoteMap() +void VoteMap(void) { char arg_1[1024]; @@ -516,7 +516,7 @@ void VoteMap() VoteMapSpecific(arg_1); } -void ShowMaps() +void ShowMaps(void) { int i, cnt; char arg_1[1024]; diff --git a/src/maps_map_dm3.c b/src/maps_map_dm3.c index f5c42a5a..db43cba0 100644 --- a/src/maps_map_dm3.c +++ b/src/maps_map_dm3.c @@ -4,7 +4,7 @@ #include "g_local.h" -void DM3CampLogic() +void DM3CampLogic(void) { if (NumberOfClients() > 1) { diff --git a/src/maps_map_dm4.c b/src/maps_map_dm4.c index 01b8918a..c9432f85 100644 --- a/src/maps_map_dm4.c +++ b/src/maps_map_dm4.c @@ -4,7 +4,7 @@ #include "g_local.h" -void DM4CampLogic() +void DM4CampLogic(void) { gedict_t *enemy_ = &g_edicts[self->s.v.enemy]; diff --git a/src/maps_map_dm6.c b/src/maps_map_dm6.c index 4f30a505..a117ee2d 100644 --- a/src/maps_map_dm6.c +++ b/src/maps_map_dm6.c @@ -11,7 +11,7 @@ qbool CheckNewWeapon(int weapon); // FIXME: Globals extern gedict_t *markers[]; -void DM6CampLogic() +void DM6CampLogic(void) { qbool has_weapon = (int)self->s.v.items & (IT_ROCKET_LAUNCHER | IT_LIGHTNING); diff --git a/src/marker_load.c b/src/marker_load.c index 7993aec0..3be7d0b7 100644 --- a/src/marker_load.c +++ b/src/marker_load.c @@ -265,7 +265,7 @@ gedict_t* CreateMarker(float x, float y, float z) return marker; } -void AllMarkersLoaded() +void AllMarkersLoaded(void) { self = NULL; path_normal = true; diff --git a/src/match.c b/src/match.c index ae89c77d..34350b34 100644 --- a/src/match.c +++ b/src/match.c @@ -19,14 +19,14 @@ #include "g_local.h" -void NextLevel(); -void IdlebotForceStart(); -void StartMatch(); -void remove_specs_wizards(); -void lastscore_add(); -void StartLogs(); -void StopLogs(); -void ClearDemoMarkers(); +void NextLevel(void); +void IdlebotForceStart(void); +void StartMatch(void); +void remove_specs_wizards(void); +void lastscore_add(void); +void StartLogs(void); +void StopLogs(void); +void ClearDemoMarkers(void); void EM_CorrectStats(void); void MatchEndStats(void); @@ -69,7 +69,7 @@ int WeirdCountPlayers(void) return num; } -float CountPlayers() +float CountPlayers(void) { gedict_t *p; float num = 0; @@ -98,7 +98,7 @@ float CountBots(void) return num; } -float CountRPlayers() +float CountRPlayers(void) { gedict_t *p; float num = 0; @@ -114,7 +114,7 @@ float CountRPlayers() return num; } -float CountTeams() +float CountTeams(void) { gedict_t *p, *p2; float num = 0; @@ -147,7 +147,7 @@ float CountTeams() } // return number of teams where at least one member is ready? -float CountRTeams() +float CountRTeams(void) { gedict_t *p, *p2; float num = 0; @@ -231,7 +231,7 @@ int CheckMembers(float memcnt) extern demo_marker_t demo_markers[]; extern int demo_marker_index; -void ListDemoMarkers() +void ListDemoMarkers(void) { int i = 0; @@ -461,7 +461,7 @@ void EndMatch(float skip_log) } } -void SaveOvertimeStats() +void SaveOvertimeStats(void) { gedict_t *p; @@ -477,7 +477,7 @@ void SaveOvertimeStats() } } -void CheckOvertime() +void CheckOvertime(void) { // SM_PrepareShowscores() is called in StartMatch(), but in matchless mode this happens when the first player joins. // Therefore, teams != 2 yet and the function doesn't do anything. @@ -599,7 +599,7 @@ void CheckOvertime() // Called every second during a match. cnt = minutes, cnt2 = seconds left. // Tells the time every now and then. -void TimerThink() +void TimerThink(void) { gedict_t *p; int idle_time; @@ -796,7 +796,7 @@ void TimerThink() } // remove/add some items from map regarding dmm and game mode -void SM_PrepareMap() +void SM_PrepareMap(void) { gedict_t *p; @@ -878,7 +878,7 @@ void SM_PrepareMap() } // put clients in server and reset some params -static void SM_PrepareClients() +static void SM_PrepareClients(void) { int hdc, i; char *pl_team; @@ -1003,7 +1003,7 @@ static void SM_ExecuteQueuedSpawnEffects(void) } } -void SM_PrepareShowscores() +void SM_PrepareShowscores(void) { gedict_t *p; char *team1 = ""; @@ -1073,7 +1073,7 @@ void SM_PrepareShowscores() } } -void SM_PrepareHostname() +void SM_PrepareHostname(void) { char *team1 = cvar_string("_k_team1"); char *team2 = cvar_string("_k_team2"); @@ -1099,7 +1099,7 @@ void SM_PrepareHostname() } } -void SM_on_MatchStart() +void SM_on_MatchStart(void) { gedict_t *p; @@ -1110,9 +1110,9 @@ void SM_on_MatchStart() } // Reset player frags and start the timer. -void HideSpawnPoints(); +void HideSpawnPoints(void); -void StartMatch() +void StartMatch(void) { char date[64]; @@ -1816,7 +1816,7 @@ qbool isCanStart(gedict_t *s, qbool forceMembersWarn) return true; } -void standby_think() +void standby_think(void) { gedict_t *p; @@ -1854,7 +1854,7 @@ void standby_think() } // Called every second during the countdown. -void TimerStartThink() +void TimerStartThink(void) { gedict_t *p; @@ -1913,7 +1913,7 @@ void TimerStartThink() self->s.v.nextthink = g_globalvars.time + 1; } -void ShowMatchSettings() +void ShowMatchSettings(void) { int i; char *txt = ""; @@ -1988,7 +1988,7 @@ void ShowMatchSettings() // ra_10[dm3] // where 10 is count of players // unknown_10[dm3] // where 10 is count of players -char* CompilateDemoName() +char* CompilateDemoName(void) { static char demoname[60]; char date[128], *fmt; @@ -2183,7 +2183,7 @@ char* CompilateDemoName() return demoname; } -void StartDemoRecord() +void StartDemoRecord(void) { char *demoname; @@ -2230,7 +2230,7 @@ void StartDemoRecord() } // Spawns the timer and starts the countdown. -void StartTimer() +void StartTimer(void) { gedict_t *timer; @@ -2405,7 +2405,7 @@ void StopTimer(int removeDemo) } } -void IdlebotForceStart() +void IdlebotForceStart(void) { gedict_t *p; int i; @@ -2442,7 +2442,7 @@ void IdlebotForceStart() } } -void IdlebotThink() +void IdlebotThink(void) { gedict_t *p; int i; @@ -2508,7 +2508,7 @@ void IdlebotThink() self->s.v.nextthink = g_globalvars.time + 1; } -void IdlebotCheck() +void IdlebotCheck(void) { gedict_t *p; int i; @@ -2778,12 +2778,17 @@ void PlayerReady(qbool startIdlebot) StartTimer(); } -void PlayerSlowReady() +void PlayerSlowReady(void) { PlayerReady(false); } -void PlayerBreak() +void PlayerFastReady(void) +{ + PlayerReady(true); +} + +void PlayerBreak(void) { int votes; gedict_t *p; diff --git a/src/misc.c b/src/misc.c index d0597c50..0777d6a2 100644 --- a/src/misc.c +++ b/src/misc.c @@ -29,7 +29,7 @@ #define START_OFF 1 -void light_use() +void light_use(void) { if ((int)(self->s.v.spawnflags) & START_OFF) { @@ -49,7 +49,7 @@ void light_use() Default style is 0 If targeted, it will toggle between on or off. */ -void SP_light() +void SP_light(void) { if (!self->targetname) { // inert light @@ -79,7 +79,7 @@ void SP_light() If targeted, it will toggle between on or off. Makes steady fluorescent humming sound */ -void SP_light_fluoro() +void SP_light_fluoro(void) { if (self->style >= 32) { @@ -105,7 +105,7 @@ void SP_light_fluoro() Default style is 10 Makes sparking, broken fluorescent sound */ -void SP_light_fluorospark() +void SP_light_fluorospark(void) { if (!self->style) { @@ -122,7 +122,7 @@ void SP_light_fluorospark() Default light value is 300 Default style is 0 */ -void SP_light_globe() +void SP_light_globe(void) { trap_precache_model("progs/s_light.spr"); setmodel(self, "progs/s_light.spr"); @@ -142,7 +142,7 @@ void FireAmbient(gedict_t *self) Default light value is 200 Default style is 0 */ -void SP_light_torch_small_walltorch() +void SP_light_torch_small_walltorch(void) { trap_precache_model("progs/flame.mdl"); setmodel(self, "progs/flame.mdl"); @@ -153,7 +153,7 @@ void SP_light_torch_small_walltorch() /*QUAKED light_flame_large_yellow (0 1 0) (-10 -10 -12) (12 12 18) Large yellow flame ball */ -void SP_light_flame_large_yellow() +void SP_light_flame_large_yellow(void) { trap_precache_model("progs/flame2.mdl"); setmodel(self, "progs/flame2.mdl"); @@ -165,7 +165,7 @@ void SP_light_flame_large_yellow() /*QUAKED light_flame_small_yellow (0 1 0) (-8 -8 -8) (8 8 8) START_OFF Small yellow flame ball */ -void SP_light_flame_small_yellow() +void SP_light_flame_small_yellow(void) { trap_precache_model("progs/flame2.mdl"); setmodel(self, "progs/flame2.mdl"); @@ -176,7 +176,7 @@ void SP_light_flame_small_yellow() /*QUAKED light_flame_small_white (0 1 0) (-10 -10 -40) (10 10 40) START_OFF Small white flame ball */ -void SP_light_flame_small_white() +void SP_light_flame_small_white(void) { trap_precache_model("progs/flame2.mdl"); setmodel(self, "progs/flame2.mdl"); @@ -190,10 +190,10 @@ void SP_light_flame_small_white() Lava Balls */ -void fire_fly(); -void fire_touch(); +void fire_fly(void); +void fire_touch(void); -void SP_misc_fireball() +void SP_misc_fireball(void) { trap_precache_model("progs/lavaball.mdl"); self->classname = "fireball"; @@ -206,7 +206,7 @@ void SP_misc_fireball() } } -void fire_fly() +void fire_fly(void) { gedict_t *fireball; @@ -231,7 +231,7 @@ void fire_fly() self->think = (func_t) fire_fly; } -void fire_touch() +void fire_touch(void) { // Yawnmode: no damage from fireall if (!k_yawnmode) @@ -245,7 +245,7 @@ void fire_touch() //============================================================================ -void barrel_explode() +void barrel_explode(void) { self->s.v.takedamage = DAMAGE_NO; self->classname = "explo_box"; @@ -268,7 +268,7 @@ void barrel_explode() TESTING THING */ -void SP_misc_explobox() +void SP_misc_explobox(void) { float oldz; @@ -298,7 +298,7 @@ void SP_misc_explobox() Smaller exploding box, REGISTERED ONLY */ -void SP_misc_explobox2() +void SP_misc_explobox2(void) { float oldz; @@ -331,7 +331,7 @@ void SP_misc_explobox2() #define SPAWNFLAG_SUPERSPIKE 1 #define SPAWNFLAG_LASER 2 -void Laser_Touch() +void Laser_Touch(void) { vec3_t org; @@ -411,10 +411,10 @@ void LaunchLaser(vec3_t org, vec3_t vec) newmis->touch = (func_t) Laser_Touch; } -void spike_touch(); -void superspike_touch(); +void spike_touch(void); +void superspike_touch(void); -void spikeshooter_use() +void spikeshooter_use(void) { if ((int)(self->s.v.spawnflags) & SPAWNFLAG_LASER) { @@ -435,7 +435,7 @@ void spikeshooter_use() } } -void shooter_think() +void shooter_think(void) { spikeshooter_use(); self->s.v.nextthink = g_globalvars.time + self->wait; @@ -449,7 +449,7 @@ void shooter_think() Laser is only for REGISTERED. */ -void SP_trap_spikeshooter() +void SP_trap_spikeshooter(void) { SetMovedir(); self->use = (func_t) spikeshooter_use; @@ -471,7 +471,7 @@ void SP_trap_spikeshooter() "wait" g_globalvars.time between spike (1.0 default) "nextthink" delay before firing first spike, so multiple shooters can be stagered. */ -void SP_trap_shooter() +void SP_trap_shooter(void) { SP_trap_spikeshooter(); @@ -491,21 +491,21 @@ void SP_trap_shooter() =============================================================================== */ -void make_bubbles(); -void bubble_remove(); -void bubble_bob(); +void make_bubbles(void); +void bubble_remove(void); +void bubble_bob(void); /*QUAKED air_bubbles (0 .5 .8) (-8 -8 -8) (8 8 8) testing air bubbles */ -void SP_air_bubbles() +void SP_air_bubbles(void) { ent_remove(self); } -void make_bubbles() +void make_bubbles(void) { gedict_t *bubble; @@ -529,7 +529,7 @@ void make_bubbles() self->think = (func_t) make_bubbles; } -void bubble_split() +void bubble_split(void) { gedict_t *bubble; @@ -560,7 +560,7 @@ void bubble_split() } } -void bubble_remove() +void bubble_remove(void) { if (streq(other->classname, self->classname)) { @@ -572,7 +572,7 @@ void bubble_remove() ent_remove(self); } -void bubble_bob() +void bubble_bob(void) { float rnd1, rnd2, rnd3; // vec3_t vtmp1, modi; @@ -638,7 +638,7 @@ void bubble_bob() Just for the debugging level. Don't use */ -void viewthing() +void viewthing(void) { self->s.v.movetype = MOVETYPE_NONE; self->s.v.solid = SOLID_NOT; @@ -654,7 +654,7 @@ void viewthing() ============================================================================== */ -void func_wall_use() +void func_wall_use(void) { // change to alternate textures self->s.v.frame = 1 - self->s.v.frame; } @@ -662,7 +662,7 @@ void func_wall_use() /*QUAKED func_wall (0 .5 .8) ? This is just a solid wall if not inhibitted */ -void SP_func_wall() +void SP_func_wall(void) { SetVector(self->s.v.angles, 0, 0, 0); self->s.v.movetype = MOVETYPE_PUSH; // so it doesn't get pushed by anything @@ -674,7 +674,7 @@ void SP_func_wall() /*QUAKED func_illusionary (0 .5 .8) ? A simple entity that looks solid but lets you walk through it. */ -void SP_func_illusionary() +void SP_func_illusionary(void) { SetVector(self->s.v.angles, 0, 0, 0); self->s.v.movetype = MOVETYPE_NONE; @@ -686,7 +686,7 @@ void SP_func_illusionary() /*QUAKED func_episodegate (0 .5 .8) ? E1 E2 E3 E4 This bmodel will appear if the episode has allready been completed, so players can't reenter it. */ -void SP_func_episodegate() +void SP_func_episodegate(void) { if (!((int)(g_globalvars.serverflags) & (int)(self->s.v.spawnflags))) { @@ -703,7 +703,7 @@ void SP_func_episodegate() /*QUAKED func_bossgate (0 .5 .8) ? This bmodel appears unless players have all of the episode sigils. */ -void SP_func_bossgate() +void SP_func_bossgate(void) { if (((int)(g_globalvars.serverflags) & 15) == 15) { @@ -720,7 +720,7 @@ void SP_func_bossgate() //============================================================================ /*QUAKED ambient_suck_wind (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_suck_wind() +void SP_ambient_suck_wind(void) { trap_precache_sound("ambience/suck1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/suck1.wav", 1, @@ -729,7 +729,7 @@ void SP_ambient_suck_wind() /*QUAKED ambient_drone (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_drone() +void SP_ambient_drone(void) { trap_precache_sound("ambience/drone6.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/drone6.wav", 0.5, @@ -738,7 +738,7 @@ void SP_ambient_drone() /*QUAKED ambient_flouro_buzz (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_flouro_buzz() +void SP_ambient_flouro_buzz(void) { trap_precache_sound("ambience/buzz1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/buzz1.wav", 1, @@ -747,7 +747,7 @@ void SP_ambient_flouro_buzz() /*QUAKED ambient_drip (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_drip() +void SP_ambient_drip(void) { trap_precache_sound("ambience/drip1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/drip1.wav", 0.5, @@ -756,7 +756,7 @@ void SP_ambient_drip() /*QUAKED ambient_comp_hum (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_comp_hum() +void SP_ambient_comp_hum(void) { trap_precache_sound("ambience/comp1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/comp1.wav", 1, @@ -765,7 +765,7 @@ void SP_ambient_comp_hum() /*QUAKED ambient_thunder (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_thunder() +void SP_ambient_thunder(void) { trap_precache_sound("ambience/thunder1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/thunder1.wav", 0.5, @@ -774,7 +774,7 @@ void SP_ambient_thunder() /*QUAKED ambient_light_buzz (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_light_buzz() +void SP_ambient_light_buzz(void) { trap_precache_sound("ambience/fl_hum1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/fl_hum1.wav", 0.5, @@ -783,7 +783,7 @@ void SP_ambient_light_buzz() /*QUAKED ambient_swamp1 (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_swamp1() +void SP_ambient_swamp1(void) { trap_precache_sound("ambience/swamp1.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/swamp1.wav", 0.5, @@ -792,14 +792,14 @@ void SP_ambient_swamp1() /*QUAKED ambient_swamp2 (0.3 0.1 0.6) (-10 -10 -8) (10 10 8) */ -void SP_ambient_swamp2() +void SP_ambient_swamp2(void) { trap_precache_sound("ambience/swamp2.wav"); trap_ambientsound(PASSVEC3(self->s.v.origin), "ambience/swamp2.wav", 0.5, ATTN_STATIC); } -void SP_ambient_general() +void SP_ambient_general(void) { if (strnull(self->noise)) { @@ -832,7 +832,7 @@ void SP_ambient_general() //============================================================================ -void noise_think() +void noise_think(void) { self->s.v.nextthink = g_globalvars.time + 0.5; sound(self, 1, "enforcer/enfire.wav", 1, ATTN_NORM); @@ -849,7 +849,7 @@ void noise_think() For optimzation testing, starts a lot of sounds. */ -void SP_misc_noisemaker() +void SP_misc_noisemaker(void) { trap_precache_sound("enforcer/enfire.wav"); trap_precache_sound("enforcer/enfstop.wav"); diff --git a/src/motd.c b/src/motd.c index 75c500c1..42bfdb14 100644 --- a/src/motd.c +++ b/src/motd.c @@ -20,7 +20,7 @@ // motd.c #include "g_local.h" -void PMOTDThink() +void PMOTDThink(void) { int i; char buf[2048] = @@ -92,12 +92,12 @@ void PMOTDThink() self->s.v.nextthink = g_globalvars.time + 0.7; } -void SMOTDThink() +void SMOTDThink(void) { PMOTDThink(); // equal motd for player and spectator now } -void MOTDThinkX() +void MOTDThinkX(void) { gedict_t *owner = PROG_TO_EDICT(self->s.v.owner); @@ -133,7 +133,7 @@ void MOTDThinkX() } } -void MakeMOTD() +void MakeMOTD(void) { gedict_t *motd; int i = bound(0, cvar("k_motd_time"), 30); @@ -146,7 +146,7 @@ void MakeMOTD() motd->attack_finished = g_globalvars.time + (i ? i : (k_matchLess ? 3 : 7)); } -void RemoveMOTD() +void RemoveMOTD(void) { gedict_t *motd; int owner = EDICT_TO_PROG(self); diff --git a/src/plats.c b/src/plats.c index 8b84b43a..8934ceeb 100644 --- a/src/plats.c +++ b/src/plats.c @@ -25,16 +25,16 @@ #include "g_local.h" -void plat_center_touch(); -void plat_outside_touch(); -void plat_trigger_use(); -void plat_go_up(); -void plat_go_down(); -void plat_crush(); +void plat_center_touch(void); +void plat_outside_touch(void); +void plat_trigger_use(void); +void plat_go_up(void); +void plat_go_down(void); +void plat_crush(void); #define PLAT_LOW_TRIGGER 1 -void plat_spawn_inside_trigger() +void plat_spawn_inside_trigger(void) { gedict_t *trigger; vec3_t tmin, tmax; @@ -76,7 +76,7 @@ void plat_spawn_inside_trigger() setsize(trigger, PASSVEC3(tmin), PASSVEC3(tmax)); } -void plat_hit_top() +void plat_hit_top(void) { sound(self, CHAN_NO_PHS_ADD + CHAN_VOICE, self->noise1, 1, ATTN_NORM); self->state = STATE_TOP; @@ -91,7 +91,7 @@ void plat_hit_top() #endif } -void plat_hit_bottom() +void plat_hit_bottom(void) { sound(self, CHAN_NO_PHS_ADD + CHAN_VOICE, self->noise1, 1, ATTN_NORM); self->state = STATE_BOTTOM; @@ -104,21 +104,21 @@ void plat_hit_bottom() #endif } -void plat_go_down() +void plat_go_down(void) { sound(self, CHAN_VOICE, self->noise, 1, ATTN_NORM); self->state = STATE_DOWN; SUB_CalcMove(self->pos2, self->speed, plat_hit_bottom); } -void plat_go_up() +void plat_go_up(void) { sound(self, CHAN_VOICE, self->noise, 1, ATTN_NORM); self->state = STATE_UP; SUB_CalcMove(self->pos1, self->speed, plat_hit_top); } -void plat_center_touch() +void plat_center_touch(void) { // return if countdown or map frozen if (!k_practice) // #practice mode# @@ -154,7 +154,7 @@ void plat_center_touch() } } -void plat_outside_touch() +void plat_outside_touch(void) { // return if countdown or map frozen if (!k_practice) // #practice mode# @@ -183,7 +183,7 @@ void plat_outside_touch() } } -void plat_trigger_use() +void plat_trigger_use(void) { if (self->think) { @@ -193,7 +193,7 @@ void plat_trigger_use() plat_go_down(); } -void plat_crush() +void plat_crush(void) { //dprint ("plat_crush\n"); @@ -214,7 +214,7 @@ void plat_crush() } } -void plat_use() +void plat_use(void) { self->use = (func_t) SUB_Null; if (self->state != STATE_UP) @@ -238,7 +238,7 @@ void plat_use() 2) chain slow */ -void SP_func_plat() +void SP_func_plat(void) { //gedict_t* t; @@ -323,10 +323,10 @@ void SP_func_plat() //============================================================================ -void train_next(); -void funcref_train_find(); +void train_next(void); +void funcref_train_find(void); -void train_blocked() +void train_blocked(void) { if (g_globalvars.time < self->attack_finished) { @@ -338,7 +338,7 @@ void train_blocked() T_Damage(other, self, self, self->dmg); } -void train_use() +void train_use(void) { if (self->think != (func_t) funcref_train_find) { @@ -348,7 +348,7 @@ void train_use() train_next(); } -void train_wait() +void train_wait(void) { if (self->wait) { @@ -367,7 +367,7 @@ void train_wait() } } -void train_next() +void train_next(void) { gedict_t *targ; vec3_t tmpv; @@ -398,7 +398,7 @@ void train_next() SUB_CalcMove(tmpv, self->speed, train_wait); } -void funcref_train_find() +void funcref_train_find(void) { gedict_t *targ; @@ -433,7 +433,7 @@ void funcref_train_find() 1) ratchet metal */ -void SP_func_train() +void SP_func_train(void) { if (!self->speed) { @@ -489,7 +489,7 @@ void SP_func_train() /*QUAKED misc_teleporttrain (0 .5 .8) (-8 -8 -8) (8 8 8) This is used for the final bos */ -void SP_misc_teleporttrain() +void SP_misc_teleporttrain(void) { if (!self->speed) { diff --git a/src/player.c b/src/player.c index f7d6e42e..f7c26c3e 100644 --- a/src/player.c +++ b/src/player.c @@ -25,7 +25,7 @@ #include "g_local.h" -void bubble_bob(); +void bubble_bob(void); void BotPlayerDeathEvent(gedict_t *player); void AmmoUsed(gedict_t *player); @@ -37,9 +37,9 @@ void AmmoUsed(gedict_t *player); ============================================================================== */ -void player_run(); +void player_run(void); -void player_stand1() +void player_stand1(void) { self->s.v.frame = 17; self->think = (func_t) player_stand1; @@ -77,7 +77,7 @@ void player_stand1() self->walkframe = self->walkframe + 1; } -void player_run() +void player_run(void) { self->s.v.frame = 6; self->think = (func_t) player_run; @@ -128,14 +128,14 @@ void player_run() self->walkframe = self->walkframe + 1; } -void muzzleflash() +void muzzleflash(void) { WriteByte( MSG_MULTICAST, SVC_MUZZLEFLASH); WriteEntity( MSG_MULTICAST, self); trap_multicast(PASSVEC3(self->s.v.origin), MULTICAST_PVS); } -void player_chain1() +void player_chain1(void) { self->s.v.frame = 137; self->think = (func_t) player_chain2; @@ -144,7 +144,7 @@ void player_chain1() GrappleThrow(); } -void player_chain2() +void player_chain2(void) { self->s.v.frame = 138; self->think = (func_t) player_chain3; @@ -152,7 +152,7 @@ void player_chain2() self->s.v.weaponframe = 3; } -void player_chain3() +void player_chain3(void) { self->s.v.frame = 139; self->s.v.weaponframe = 3; @@ -173,7 +173,7 @@ void player_chain3() } } -void player_chain4() +void player_chain4(void) { // Original ctf grapple used frame 73 here, but that causes problems with cl_deadbodyfilter 2 // Frame 139 is a decent alternative especially given that 73 never looked good anyway @@ -196,7 +196,7 @@ void player_chain4() } } -void player_chain5() +void player_chain5(void) { self->s.v.frame = 140; self->s.v.weaponframe = 5; @@ -206,7 +206,7 @@ void player_chain5() self->s.v.nextthink = next_frame(); } -void player_shot1() +void player_shot1(void) { self->s.v.frame = 113; self->think = (func_t) player_shot2; @@ -216,7 +216,7 @@ void player_shot1() muzzleflash(); } -void player_shot2() +void player_shot2(void) { self->s.v.frame = 114; self->think = (func_t) player_shot3; @@ -225,7 +225,7 @@ void player_shot2() self->s.v.weaponframe = 2; } -void player_shot3() +void player_shot3(void) { self->s.v.frame = 115; self->think = (func_t) player_shot4; @@ -234,7 +234,7 @@ void player_shot3() self->s.v.weaponframe = 3; } -void player_shot4() +void player_shot4(void) { self->s.v.frame = 116; self->think = (func_t) player_shot5; @@ -242,7 +242,7 @@ void player_shot4() self->s.v.weaponframe = 4; } -void player_shot5() +void player_shot5(void) { self->s.v.frame = 117; self->think = (func_t) player_shot6; @@ -251,7 +251,7 @@ void player_shot5() self->s.v.weaponframe = 5; } -void player_shot6() +void player_shot6(void) { self->s.v.frame = 118; self->walkframe = 0; @@ -261,7 +261,7 @@ void player_shot6() self->s.v.weaponframe = 6; } -void player_axe1() +void player_axe1(void) { self->s.v.frame = 119; self->think = (func_t) player_axe2; @@ -270,7 +270,7 @@ void player_axe1() self->s.v.weaponframe = 1; } -void player_axe2() +void player_axe2(void) { self->s.v.frame = 120; self->think = (func_t) player_axe3; @@ -279,7 +279,7 @@ void player_axe2() self->s.v.weaponframe = 2; } -void player_axe3() +void player_axe3(void) { self->s.v.frame = 121; self->think = (func_t) player_axe4; @@ -289,7 +289,7 @@ void player_axe3() W_FireAxe(); } -void player_axe4() +void player_axe4(void) { self->s.v.frame = 122; self->walkframe = 0; @@ -299,7 +299,7 @@ void player_axe4() self->s.v.weaponframe = 4; } -void player_axeb1() +void player_axeb1(void) { self->s.v.frame = 125; self->think = (func_t) player_axeb2; @@ -308,7 +308,7 @@ void player_axeb1() self->s.v.weaponframe = 5; } -void player_axeb2() +void player_axeb2(void) { self->s.v.frame = 126; self->think = (func_t) player_axeb3; @@ -317,7 +317,7 @@ void player_axeb2() self->s.v.weaponframe = 6; } -void player_axeb3() +void player_axeb3(void) { self->s.v.frame = 127; self->think = (func_t) player_axeb4; @@ -327,7 +327,7 @@ void player_axeb3() W_FireAxe(); } -void player_axeb4() +void player_axeb4(void) { self->s.v.frame = 128; self->walkframe = 0; @@ -337,7 +337,7 @@ void player_axeb4() self->s.v.weaponframe = 8; } -void player_axec1() +void player_axec1(void) { self->s.v.frame = 131; self->think = (func_t) player_axec2; @@ -346,7 +346,7 @@ void player_axec1() self->s.v.weaponframe = 1; } -void player_axec2() +void player_axec2(void) { self->s.v.frame = 132; self->think = (func_t) player_axec3; @@ -355,7 +355,7 @@ void player_axec2() self->s.v.weaponframe = 2; } -void player_axec3() +void player_axec3(void) { self->s.v.frame = 133; self->think = (func_t) player_axec4; @@ -365,7 +365,7 @@ void player_axec3() W_FireAxe(); } -void player_axec4() +void player_axec4(void) { self->s.v.frame = 134; self->walkframe = 0; @@ -375,7 +375,7 @@ void player_axec4() self->s.v.weaponframe = 4; } -void player_axed1() +void player_axed1(void) { self->s.v.frame = 137; self->think = (func_t) player_axed2; @@ -384,7 +384,7 @@ void player_axed1() self->s.v.weaponframe = 5; } -void player_axed2() +void player_axed2(void) { self->s.v.frame = 138; self->think = (func_t) player_axed3; @@ -393,7 +393,7 @@ void player_axed2() self->s.v.weaponframe = 6; } -void player_axed3() +void player_axed3(void) { self->s.v.frame = 139; self->think = (func_t) player_axed4; @@ -403,7 +403,7 @@ void player_axed3() W_FireAxe(); } -void player_axed4() +void player_axed4(void) { self->s.v.frame = 140; self->walkframe = 0; @@ -416,7 +416,7 @@ void player_axed4() //============================================================================ // this shit present in ktpro, but test does't show why we need this, because 99.9% of time diff is just 0 -void set_idealtime() +void set_idealtime(void) { float diff = self->s.v.ltime - g_globalvars.time; @@ -428,7 +428,7 @@ void set_idealtime() self->s.v.nextthink = self->s.v.ltime = g_globalvars.time + diff + 0.1; } -void player_nail1() +void player_nail1(void) { self->s.v.frame = 103; self->think = (func_t) player_nail2; @@ -457,7 +457,7 @@ void player_nail1() AmmoUsed(self); } -void player_nail2() +void player_nail2(void) { self->s.v.frame = 104; self->think = (func_t) player_nail1; @@ -488,7 +488,7 @@ void player_nail2() //============================================================================ -void player_light1() +void player_light1(void) { self->s.v.frame = 105; self->think = (func_t) player_light2; @@ -521,7 +521,7 @@ void player_light1() self->attack_finished = g_globalvars.time + 0.2; } -void player_light2() +void player_light2(void) { self->s.v.frame = 106; self->think = (func_t) player_light1; @@ -555,7 +555,7 @@ void player_light2() } //============================================================================ -void player_rocket1() +void player_rocket1(void) { self->s.v.frame = 107; self->think = (func_t) player_rocket2; @@ -565,7 +565,7 @@ void player_rocket1() muzzleflash(); } -void player_rocket2() +void player_rocket2(void) { self->s.v.frame = 108; self->think = (func_t) player_rocket3; @@ -574,7 +574,7 @@ void player_rocket2() self->s.v.weaponframe = 2; } -void player_rocket3() +void player_rocket3(void) { self->s.v.frame = 109; self->think = (func_t) player_rocket4; @@ -583,7 +583,7 @@ void player_rocket3() self->s.v.weaponframe = 3; } -void player_rocket4() +void player_rocket4(void) { self->s.v.frame = 110; self->think = (func_t) player_rocket5; @@ -592,7 +592,7 @@ void player_rocket4() self->s.v.weaponframe = 4; } -void player_rocket5() +void player_rocket5(void) { self->s.v.frame = 111; self->think = (func_t) player_rocket6; @@ -601,7 +601,7 @@ void player_rocket5() self->s.v.weaponframe = 5; } -void player_rocket6() +void player_rocket6(void) { self->s.v.frame = 112; self->walkframe = 0; @@ -613,7 +613,7 @@ void player_rocket6() void DeathBubbles(float num_bubbles); -void PainSound() +void PainSound(void) { int rs; @@ -737,7 +737,7 @@ void PainSound() return; } -void player_pain1() +void player_pain1(void) { self->s.v.frame = 35; self->think = (func_t) player_pain2; @@ -747,7 +747,7 @@ void player_pain1() self->s.v.weaponframe = 0; } -void player_pain2() +void player_pain2(void) { self->s.v.frame = 36; self->think = (func_t) player_pain3; @@ -755,7 +755,7 @@ void player_pain2() } -void player_pain3() +void player_pain3(void) { self->s.v.frame = 37; self->think = (func_t) player_pain4; @@ -763,7 +763,7 @@ void player_pain3() } -void player_pain4() +void player_pain4(void) { self->s.v.frame = 38; self->think = (func_t) player_pain5; @@ -771,7 +771,7 @@ void player_pain4() } -void player_pain5() +void player_pain5(void) { self->s.v.frame = 39; self->think = (func_t) player_pain6; @@ -779,7 +779,7 @@ void player_pain5() } -void player_pain6() +void player_pain6(void) { self->s.v.frame = 40; self->walkframe = 0; @@ -788,7 +788,7 @@ void player_pain6() } -void player_axpain1() +void player_axpain1(void) { self->s.v.frame = 29; self->think = (func_t) player_axpain2; @@ -798,7 +798,7 @@ void player_axpain1() self->s.v.weaponframe = 0; } -void player_axpain2() +void player_axpain2(void) { self->s.v.frame = 30; self->think = (func_t) player_axpain3; @@ -806,7 +806,7 @@ void player_axpain2() } -void player_axpain3() +void player_axpain3(void) { self->s.v.frame = 31; self->think = (func_t) player_axpain4; @@ -814,7 +814,7 @@ void player_axpain3() } -void player_axpain4() +void player_axpain4(void) { self->s.v.frame = 32; self->think = (func_t) player_axpain5; @@ -822,7 +822,7 @@ void player_axpain4() } -void player_axpain5() +void player_axpain5(void) { self->s.v.frame = 33; self->think = (func_t) player_axpain6; @@ -830,7 +830,7 @@ void player_axpain5() } -void player_axpain6() +void player_axpain6(void) { self->s.v.frame = 34; self->walkframe = 0; @@ -873,14 +873,14 @@ void player_pain(struct gedict_s *attacker, float take) } } -void player_diea1(); -void player_dieb1(); -void player_diec1(); -void player_died1(); -void player_diee1(); -void player_die_ax1(); +void player_diea1(void); +void player_dieb1(void); +void player_diec1(void); +void player_died1(void); +void player_diee1(void); +void player_die_ax1(void); -void DeathBubblesSpawn() +void DeathBubblesSpawn(void) { gedict_t *bubble; @@ -936,7 +936,7 @@ void DeathBubbles(float num_bubbles) return; } -void DeathSound() +void DeathSound(void) { int rs; @@ -980,7 +980,7 @@ void DeathSound() return; } -void PlayerDead() +void PlayerDead(void) { self->s.v.nextthink = -1; // allow respawn after a certain time @@ -1085,7 +1085,7 @@ void ThrowHead(char *gibname, float dm) SetVector(self->s.v.avelocity, 0, crandom() * 600, 0); } -void GibPlayer() +void GibPlayer(void) { qbool bloodfest_round_connect = (k_bloodfest && !self->ready); // in case of bloodfest and connecion during round. gedict_t *p; @@ -1135,9 +1135,9 @@ void GibPlayer() } } -void StartDie(); +void StartDie(void); -void PlayerDie() +void PlayerDie(void) { self->ca_alive = false; @@ -1226,7 +1226,7 @@ void PlayerDie() // created this function because it is called from client.qc as well // was originally part of PlayerDie() and hasn't been altered -void StartDie() +void StartDie(void) { if (self->s.v.weapon == IT_AXE) { @@ -1286,7 +1286,7 @@ void StartDie() } } -void player_diea1() +void player_diea1(void) { self->s.v.frame = 50; self->think = (func_t) player_diea2; @@ -1294,7 +1294,7 @@ void player_diea1() } -void player_diea2() +void player_diea2(void) { self->s.v.frame = 51; self->think = (func_t) player_diea3; @@ -1302,7 +1302,7 @@ void player_diea2() } -void player_diea3() +void player_diea3(void) { self->s.v.frame = 52; self->think = (func_t) player_diea4; @@ -1310,7 +1310,7 @@ void player_diea3() } -void player_diea4() +void player_diea4(void) { self->s.v.frame = 53; self->think = (func_t) player_diea5; @@ -1318,7 +1318,7 @@ void player_diea4() } -void player_diea5() +void player_diea5(void) { self->s.v.frame = 54; self->think = (func_t) player_diea6; @@ -1326,7 +1326,7 @@ void player_diea5() } -void player_diea6() +void player_diea6(void) { self->s.v.frame = 55; self->think = (func_t) player_diea7; @@ -1334,7 +1334,7 @@ void player_diea6() } -void player_diea7() +void player_diea7(void) { self->s.v.frame = 56; self->think = (func_t) player_diea8; @@ -1342,7 +1342,7 @@ void player_diea7() } -void player_diea8() +void player_diea8(void) { self->s.v.frame = 57; self->think = (func_t) player_diea9; @@ -1350,7 +1350,7 @@ void player_diea8() } -void player_diea9() +void player_diea9(void) { self->s.v.frame = 58; self->think = (func_t) player_diea10; @@ -1358,7 +1358,7 @@ void player_diea9() } -void player_diea10() +void player_diea10(void) { self->s.v.frame = 59; self->think = (func_t) player_diea11; @@ -1366,7 +1366,7 @@ void player_diea10() } -void player_diea11() +void player_diea11(void) { self->s.v.frame = 60; self->think = (func_t) player_diea11; @@ -1375,7 +1375,7 @@ void player_diea11() PlayerDead(); } -void player_dieb1() +void player_dieb1(void) { self->s.v.frame = 61; self->think = (func_t) player_dieb2; @@ -1383,7 +1383,7 @@ void player_dieb1() } -void player_dieb2() +void player_dieb2(void) { self->s.v.frame = 62; self->think = (func_t) player_dieb3; @@ -1391,7 +1391,7 @@ void player_dieb2() } -void player_dieb3() +void player_dieb3(void) { self->s.v.frame = 63; self->think = (func_t) player_dieb4; @@ -1399,7 +1399,7 @@ void player_dieb3() } -void player_dieb4() +void player_dieb4(void) { self->s.v.frame = 64; self->think = (func_t) player_dieb5; @@ -1407,7 +1407,7 @@ void player_dieb4() } -void player_dieb5() +void player_dieb5(void) { self->s.v.frame = 65; self->think = (func_t) player_dieb6; @@ -1415,7 +1415,7 @@ void player_dieb5() } -void player_dieb6() +void player_dieb6(void) { self->s.v.frame = 66; self->think = (func_t) player_dieb7; @@ -1423,7 +1423,7 @@ void player_dieb6() } -void player_dieb7() +void player_dieb7(void) { self->s.v.frame = 67; self->think = (func_t) player_dieb8; @@ -1431,7 +1431,7 @@ void player_dieb7() } -void player_dieb8() +void player_dieb8(void) { self->s.v.frame = 68; self->think = (func_t) player_dieb9; @@ -1439,7 +1439,7 @@ void player_dieb8() } -void player_dieb9() +void player_dieb9(void) { self->s.v.frame = 69; self->think = (func_t) player_dieb9; @@ -1448,7 +1448,7 @@ void player_dieb9() PlayerDead(); } -void player_diec1() +void player_diec1(void) { self->s.v.frame = 70; self->think = (func_t) player_diec2; @@ -1456,7 +1456,7 @@ void player_diec1() } -void player_diec2() +void player_diec2(void) { self->s.v.frame = 71; self->think = (func_t) player_diec3; @@ -1464,7 +1464,7 @@ void player_diec2() } -void player_diec3() +void player_diec3(void) { self->s.v.frame = 72; self->think = (func_t) player_diec4; @@ -1472,7 +1472,7 @@ void player_diec3() } -void player_diec4() +void player_diec4(void) { self->s.v.frame = 73; self->think = (func_t) player_diec5; @@ -1480,7 +1480,7 @@ void player_diec4() } -void player_diec5() +void player_diec5(void) { self->s.v.frame = 74; self->think = (func_t) player_diec6; @@ -1488,7 +1488,7 @@ void player_diec5() } -void player_diec6() +void player_diec6(void) { self->s.v.frame = 75; self->think = (func_t) player_diec7; @@ -1496,7 +1496,7 @@ void player_diec6() } -void player_diec7() +void player_diec7(void) { self->s.v.frame = 76; self->think = (func_t) player_diec8; @@ -1504,7 +1504,7 @@ void player_diec7() } -void player_diec8() +void player_diec8(void) { self->s.v.frame = 77; self->think = (func_t) player_diec9; @@ -1512,7 +1512,7 @@ void player_diec8() } -void player_diec9() +void player_diec9(void) { self->s.v.frame = 78; self->think = (func_t) player_diec10; @@ -1520,7 +1520,7 @@ void player_diec9() } -void player_diec10() +void player_diec10(void) { self->s.v.frame = 79; self->think = (func_t) player_diec11; @@ -1528,7 +1528,7 @@ void player_diec10() } -void player_diec11() +void player_diec11(void) { self->s.v.frame = 80; self->think = (func_t) player_diec12; @@ -1536,7 +1536,7 @@ void player_diec11() } -void player_diec12() +void player_diec12(void) { self->s.v.frame = 81; self->think = (func_t) player_diec13; @@ -1544,7 +1544,7 @@ void player_diec12() } -void player_diec13() +void player_diec13(void) { self->s.v.frame = 82; self->think = (func_t) player_diec14; @@ -1552,7 +1552,7 @@ void player_diec13() } -void player_diec14() +void player_diec14(void) { self->s.v.frame = 83; self->think = (func_t) player_diec15; @@ -1560,7 +1560,7 @@ void player_diec14() } -void player_diec15() +void player_diec15(void) { self->s.v.frame = 84; self->think = (func_t) player_diec15; @@ -1569,7 +1569,7 @@ void player_diec15() PlayerDead(); } -void player_died1() +void player_died1(void) { self->s.v.frame = 85; self->think = (func_t) player_died2; @@ -1577,7 +1577,7 @@ void player_died1() } -void player_died2() +void player_died2(void) { self->s.v.frame = 86; self->think = (func_t) player_died3; @@ -1585,7 +1585,7 @@ void player_died2() } -void player_died3() +void player_died3(void) { self->s.v.frame = 87; self->think = (func_t) player_died4; @@ -1593,7 +1593,7 @@ void player_died3() } -void player_died4() +void player_died4(void) { self->s.v.frame = 88; self->think = (func_t) player_died5; @@ -1601,7 +1601,7 @@ void player_died4() } -void player_died5() +void player_died5(void) { self->s.v.frame = 89; self->think = (func_t) player_died6; @@ -1609,7 +1609,7 @@ void player_died5() } -void player_died6() +void player_died6(void) { self->s.v.frame = 90; self->think = (func_t) player_died7; @@ -1617,7 +1617,7 @@ void player_died6() } -void player_died7() +void player_died7(void) { self->s.v.frame = 91; self->think = (func_t) player_died8; @@ -1625,7 +1625,7 @@ void player_died7() } -void player_died8() +void player_died8(void) { self->s.v.frame = 92; self->think = (func_t) player_died9; @@ -1633,7 +1633,7 @@ void player_died8() } -void player_died9() +void player_died9(void) { self->s.v.frame = 93; self->think = (func_t) player_died9; @@ -1642,7 +1642,7 @@ void player_died9() PlayerDead(); } -void player_diee1() +void player_diee1(void) { self->s.v.frame = 94; self->think = (func_t) player_diee2; @@ -1650,7 +1650,7 @@ void player_diee1() } -void player_diee2() +void player_diee2(void) { self->s.v.frame = 95; self->think = (func_t) player_diee3; @@ -1658,7 +1658,7 @@ void player_diee2() } -void player_diee3() +void player_diee3(void) { self->s.v.frame = 96; self->think = (func_t) player_diee4; @@ -1666,42 +1666,42 @@ void player_diee3() } -void player_diee4() +void player_diee4(void) { self->s.v.frame = 97; self->think = (func_t) player_diee5; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_diee5() +void player_diee5(void) { self->s.v.frame = 98; self->think = (func_t) player_diee6; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_diee6() +void player_diee6(void) { self->s.v.frame = 99; self->think = (func_t) player_diee7; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_diee7() +void player_diee7(void) { self->s.v.frame = 100; self->think = (func_t) player_diee8; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_diee8() +void player_diee8(void) { self->s.v.frame = 101; self->think = (func_t) player_diee9; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_diee9() +void player_diee9(void) { self->s.v.frame = 102; self->think = (func_t) player_diee9; @@ -1709,63 +1709,63 @@ void player_diee9() PlayerDead(); } -void player_die_ax1() +void player_die_ax1(void) { self->s.v.frame = 41; self->think = (func_t) player_die_ax2; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax2() +void player_die_ax2(void) { self->s.v.frame = 42; self->think = (func_t) player_die_ax3; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax3() +void player_die_ax3(void) { self->s.v.frame = 43; self->think = (func_t) player_die_ax4; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax4() +void player_die_ax4(void) { self->s.v.frame = 44; self->think = (func_t) player_die_ax5; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax5() +void player_die_ax5(void) { self->s.v.frame = 45; self->think = (func_t) player_die_ax6; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax6() +void player_die_ax6(void) { self->s.v.frame = 46; self->think = (func_t) player_die_ax7; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax7() +void player_die_ax7(void) { self->s.v.frame = 47; self->think = (func_t) player_die_ax8; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax8() +void player_die_ax8(void) { self->s.v.frame = 48; self->think = (func_t) player_die_ax9; self->s.v.nextthink = g_globalvars.time + 0.1; } -void player_die_ax9() +void player_die_ax9(void) { self->s.v.frame = 49; self->think = (func_t) player_die_ax9; diff --git a/src/race.c b/src/race.c index d1c12daa..f9dddc65 100644 --- a/src/race.c +++ b/src/race.c @@ -4,7 +4,7 @@ #include "g_local.h" -void SP_info_intermission(); +void SP_info_intermission(void); #define MAX_TXTLEN 128 #define TOP_FILE_VERSION 2 @@ -107,8 +107,8 @@ void race_remove_ent(void); void race_set_players_movetype_and_etc(void); void race_cleanmap(void); void unmute_all_players(void); -void HideSpawnPoints(); -void ShowSpawnPoints(); +void HideSpawnPoints(void); +void ShowSpawnPoints(void); void kill_race_idler(void); void write_topscores(void); void read_topscores(void); @@ -1155,7 +1155,7 @@ void race_dim_checkpoints(void) } } -void race_blink_think() +void race_blink_think(void) { // remove "cute" effects self->s.v.effects = 0; @@ -1206,7 +1206,7 @@ void race_VelocityForDamage(float scale, vec3_t dir, vec3_t v) return; } -void race_meat_touch() +void race_meat_touch(void) { // sound( self, CHAN_WEAPON, "zombie/z_miss.wav", 1, ATTN_NORM ); // bounce sound @@ -1555,7 +1555,7 @@ static void race_over(void) } } -void race_node_touch() +void race_node_touch(void) { if (other->ct != ctPlayer) { @@ -2839,7 +2839,7 @@ void r_Xset(float t) race_route_now_custom(); // mark this is a custom route now } -void r_cdel() +void r_cdel(void) { gedict_t *e; int cnt, id; @@ -3081,7 +3081,7 @@ void r_changestatus(float t) } } -void r_timeout() +void r_timeout(void) { char arg_1[64]; @@ -3136,7 +3136,7 @@ void race_download_record_demo(void) race.records[record].demoname); } -void display_record_details() +void display_record_details(void) { int record = read_record_param(1); @@ -3170,7 +3170,7 @@ void display_record_details() redtext(race_falsestart_mode(race.records[record].startmode))); } -void r_falsestart() +void r_falsestart(void) { if (!race_command_checks()) { @@ -3233,7 +3233,7 @@ void r_clear_route(void) race_clear_pacemaker(); } -void r_mode() +void r_mode(void) { if (!race_command_checks()) { @@ -3393,7 +3393,7 @@ void r_route(void) race_clear_pacemaker(); } -void r_print() +void r_print(void) { if (!race_command_checks()) { @@ -3584,9 +3584,9 @@ void read_topscores(void) race_fgets(line, MAX_TXTLEN); race.records[cnt].time = atof(line); race_fgets(line, MAX_TXTLEN); - strlcpy(race.records[cnt].racername, line, strlen(line)); + strlcpy(race.records[cnt].racername, line, sizeof(race.records[cnt].racername)); race_fgets(line, MAX_TXTLEN); - strlcpy(race.records[cnt].demoname, line, strlen(line)); + strlcpy(race.records[cnt].demoname, line, sizeof(race.records[cnt].demoname)); race_fgets(line, MAX_TXTLEN); race.records[cnt].distance = atof(line); race_fgets(line, MAX_TXTLEN); @@ -3594,7 +3594,7 @@ void read_topscores(void) race_fgets(line, MAX_TXTLEN); race.records[cnt].avgspeed = atof(line); race_fgets(line, MAX_TXTLEN); - strlcpy(race.records[cnt].date, line, strlen(line)); + strlcpy(race.records[cnt].date, line, sizeof(race.records[cnt].date)); race_fgets(line, MAX_TXTLEN); race.records[cnt].weaponmode = atoi(line); race_fgets(line, MAX_TXTLEN); diff --git a/src/runes.c b/src/runes.c index d257f719..d50c88b5 100644 --- a/src/runes.c +++ b/src/runes.c @@ -4,11 +4,11 @@ #include "g_local.h" -void RegenLostRot(); -void RuneRespawn(); -void RuneTouch(); -void RuneResetOwner(); -char* GetRuneSpawnName(); +void RegenLostRot(void); +void RuneRespawn(void); +void RuneTouch(void); +void RuneResetOwner(void); +char* GetRuneSpawnName(void); void DoDropRune(int rune, qbool on_respawn) { @@ -146,7 +146,7 @@ void DoTossRune(int rune) item->think = (func_t) RuneResetOwner; } -void DropRune() +void DropRune(void) { if (self->ctf_flag & CTF_RUNE_RES) { @@ -176,7 +176,7 @@ void DropRune() // self->s.v.items -= ( (int)self->s.v.items & (CTF_RUNE_MASK) ); } -void TossRune() +void TossRune(void) { if (self->ctf_flag & CTF_RUNE_RES) { @@ -211,7 +211,7 @@ void TossRune() //self->s.v.items -= ( (int)self->s.v.items & (CTF_RUNE_MASK) ); } -void RegenLostRot() +void RegenLostRot(void) { other = PROG_TO_EDICT(self->s.v.owner); if ((other->s.v.health < 101) || (other->ctf_flag & CTF_RUNE_RGN) @@ -226,14 +226,14 @@ void RegenLostRot() self->s.v.nextthink = g_globalvars.time + 1; } -void RuneResetOwner() +void RuneResetOwner(void) { self->s.v.owner = EDICT_TO_PROG(self); self->think = (func_t) RuneRespawn; self->s.v.nextthink = g_globalvars.time + 90; } -void RuneRespawn() +void RuneRespawn(void) { int rune = self->ctf_flag; @@ -242,7 +242,7 @@ void RuneRespawn() DoDropRune(rune, true); } -void RuneTouch() +void RuneTouch(void) { if (other->ct != ctPlayer) { @@ -319,7 +319,7 @@ void RuneTouch() ent_remove(self); } -char* GetRuneSpawnName() +char* GetRuneSpawnName(void) { char *runespawn; @@ -459,7 +459,7 @@ void RegenerationSound(gedict_t *player) } } -void CheckStuffRune() +void CheckStuffRune(void) { char *rune = ""; diff --git a/src/server.c b/src/server.c index e20e15b8..9fde4f3a 100644 --- a/src/server.c +++ b/src/server.c @@ -52,7 +52,7 @@ moving towards it, change the next destination and continue. ============== */ -void t_movetarget() +void t_movetarget(void) { gedict_t *temp; vec3_t tmpv; @@ -107,7 +107,7 @@ void t_movetarget() } } -void movetarget_f() +void movetarget_f(void) { if (!self->targetname) { @@ -123,7 +123,7 @@ void movetarget_f() /*QUAKED path_corner (0.5 0.3 0) (-8 -8 -8) (8 8 8) Monsters will continue walking towards the next target corner. */ -void SP_path_corner() +void SP_path_corner(void) { movetarget_f(); } diff --git a/src/sp_ai.c b/src/sp_ai.c index f215620f..6dc6e432 100644 --- a/src/sp_ai.c +++ b/src/sp_ai.c @@ -112,7 +112,7 @@ float range(gedict_t *targ) ============= visible - returns 1 if the entity is visible to self, even if not infront () + returns 1 if the entity is visible to self, even if not infront (void) ============= */ float visible(gedict_t *targ) @@ -202,7 +202,7 @@ void SUB_CheckRefire(func_t thinkst) //============================================================================ -void HuntTarget() +void HuntTarget(void) { vec3_t tmpv; @@ -214,7 +214,7 @@ void HuntTarget() SUB_AttackFinished(1); // wait a while before first attack } -void SightSound() +void SightSound(void) { if (streq(self->classname, "monster_ogre")) { @@ -287,7 +287,7 @@ void SightSound() } } -void FoundTarget() +void FoundTarget(void) { if (PROG_TO_EDICT(self->s.v.enemy)->ct == ctPlayer) { // let other monsters see this monster for a while @@ -318,7 +318,7 @@ void FoundTarget() slower noticing monsters. ============ */ -float FindTarget() +float FindTarget(void) { gedict_t *client = NULL; @@ -481,7 +481,7 @@ void GetMadAtAttacker(gedict_t *attacker) ============= */ -void ai_melee() +void ai_melee(void) { vec3_t delta; float ldmg; @@ -503,7 +503,7 @@ void ai_melee() T_Damage(PROG_TO_EDICT(self->s.v.enemy), self, self, ldmg); } -void ai_melee_side() +void ai_melee_side(void) { vec3_t delta; float ldmg; @@ -608,7 +608,7 @@ void ai_walk(float dist) The monster is staying in one place for a while, with slight angle turns ============= */ -void ai_stand() +void ai_stand(void) { if (FindTarget()) { @@ -636,7 +636,7 @@ void ai_stand() don't move, but turn towards ideal_yaw ============= */ -void ai_turn() +void ai_turn(void) { if (FindTarget()) { @@ -652,7 +652,7 @@ void ai_turn() ============ */ -float FacingIdeal() +float FacingIdeal(void) { float delta; @@ -675,7 +675,7 @@ float FacingIdeal() Stay facing the enemy ============= */ -void ai_face() +void ai_face(void) { vec3_t tmpv; @@ -711,7 +711,7 @@ void ai_charge(float d) movetogoal(d); // done in C code... } -void ai_charge_side() +void ai_charge_side(void) { vec3_t tmpv; float heading; @@ -741,7 +741,7 @@ void ai_charge_side() Returns false if movement should continue ============ */ -float CheckAttack() +float CheckAttack(void) { vec3_t spot1, spot2; gedict_t *targ; @@ -836,7 +836,7 @@ float CheckAttack() return false; } -float CheckAnyAttack() +float CheckAnyAttack(void) { if (!enemy_vis) { @@ -883,7 +883,7 @@ float CheckAnyAttack() Turn and close until within an angle to launch a melee attack ============= */ -void ai_run_melee() +void ai_run_melee(void) { self->s.v.ideal_yaw = enemy_yaw; changeyaw(self); @@ -906,7 +906,7 @@ void ai_run_melee() Turn in place until within an angle to launch a missile attack ============= */ -void ai_run_missile() +void ai_run_missile(void) { self->s.v.ideal_yaw = enemy_yaw; changeyaw(self); @@ -929,7 +929,7 @@ void ai_run_missile() Strafe sideways, but stay at aproximately the same range ============= */ -void ai_run_slide() +void ai_run_slide(void) { float ofs; diff --git a/src/sp_boss.c b/src/sp_boss.c index f18a9bf3..105363d7 100644 --- a/src/sp_boss.c +++ b/src/sp_boss.c @@ -143,117 +143,117 @@ enum }; -void boss_rise1(); -void boss_rise2(); -void boss_rise3(); -void boss_rise4(); -void boss_rise5(); -void boss_rise6(); -void boss_rise7(); -void boss_rise8(); -void boss_rise9(); -void boss_rise10(); -void boss_rise11(); -void boss_rise12(); -void boss_rise13(); -void boss_rise14(); -void boss_rise15(); -void boss_rise16(); -void boss_rise17(); -void boss_idle1(); -void boss_idle2(); -void boss_idle3(); -void boss_idle4(); -void boss_idle5(); -void boss_idle6(); -void boss_idle7(); -void boss_idle8(); -void boss_idle9(); -void boss_idle10(); -void boss_idle11(); -void boss_idle12(); -void boss_idle13(); -void boss_idle14(); -void boss_idle15(); -void boss_idle16(); -void boss_idle17(); -void boss_idle18(); -void boss_idle19(); -void boss_idle20(); -void boss_idle21(); -void boss_idle22(); -void boss_idle23(); -void boss_idle24(); -void boss_idle25(); -void boss_idle26(); -void boss_idle27(); -void boss_idle28(); -void boss_idle29(); -void boss_idle30(); -void boss_idle31(); -void boss_missile1(); -void boss_missile2(); -void boss_missile3(); -void boss_missile4(); -void boss_missile5(); -void boss_missile6(); -void boss_missile7(); -void boss_missile8(); -void boss_missile9(); -void boss_missile10(); -void boss_missile11(); -void boss_missile12(); -void boss_missile13(); -void boss_missile14(); -void boss_missile15(); -void boss_missile16(); -void boss_missile17(); -void boss_missile18(); -void boss_missile19(); -void boss_missile20(); -void boss_missile21(); -void boss_missile22(); -void boss_missile23(); -void boss_shocka1(); -void boss_shocka2(); -void boss_shocka3(); -void boss_shocka4(); -void boss_shocka5(); -void boss_shocka6(); -void boss_shocka7(); -void boss_shocka8(); -void boss_shocka9(); -void boss_shocka10(); -void boss_shockb1(); -void boss_shockb2(); -void boss_shockb3(); -void boss_shockb4(); -void boss_shockb5(); -void boss_shockb6(); -void boss_shockb7(); -void boss_shockb8(); -void boss_shockb9(); -void boss_shockb10(); -void boss_shockc1(); -void boss_shockc2(); -void boss_shockc3(); -void boss_shockc4(); -void boss_shockc5(); -void boss_shockc6(); -void boss_shockc7(); -void boss_shockc8(); -void boss_shockc9(); -void boss_shockc10(); -void boss_death1(); -void boss_death2(); -void boss_death3(); -void boss_death4(); -void boss_death5(); -void boss_death6(); -void boss_death7(); -void boss_death8(); -void boss_death9(); -void boss_death10(); +void boss_rise1(void); +void boss_rise2(void); +void boss_rise3(void); +void boss_rise4(void); +void boss_rise5(void); +void boss_rise6(void); +void boss_rise7(void); +void boss_rise8(void); +void boss_rise9(void); +void boss_rise10(void); +void boss_rise11(void); +void boss_rise12(void); +void boss_rise13(void); +void boss_rise14(void); +void boss_rise15(void); +void boss_rise16(void); +void boss_rise17(void); +void boss_idle1(void); +void boss_idle2(void); +void boss_idle3(void); +void boss_idle4(void); +void boss_idle5(void); +void boss_idle6(void); +void boss_idle7(void); +void boss_idle8(void); +void boss_idle9(void); +void boss_idle10(void); +void boss_idle11(void); +void boss_idle12(void); +void boss_idle13(void); +void boss_idle14(void); +void boss_idle15(void); +void boss_idle16(void); +void boss_idle17(void); +void boss_idle18(void); +void boss_idle19(void); +void boss_idle20(void); +void boss_idle21(void); +void boss_idle22(void); +void boss_idle23(void); +void boss_idle24(void); +void boss_idle25(void); +void boss_idle26(void); +void boss_idle27(void); +void boss_idle28(void); +void boss_idle29(void); +void boss_idle30(void); +void boss_idle31(void); +void boss_missile1(void); +void boss_missile2(void); +void boss_missile3(void); +void boss_missile4(void); +void boss_missile5(void); +void boss_missile6(void); +void boss_missile7(void); +void boss_missile8(void); +void boss_missile9(void); +void boss_missile10(void); +void boss_missile11(void); +void boss_missile12(void); +void boss_missile13(void); +void boss_missile14(void); +void boss_missile15(void); +void boss_missile16(void); +void boss_missile17(void); +void boss_missile18(void); +void boss_missile19(void); +void boss_missile20(void); +void boss_missile21(void); +void boss_missile22(void); +void boss_missile23(void); +void boss_shocka1(void); +void boss_shocka2(void); +void boss_shocka3(void); +void boss_shocka4(void); +void boss_shocka5(void); +void boss_shocka6(void); +void boss_shocka7(void); +void boss_shocka8(void); +void boss_shocka9(void); +void boss_shocka10(void); +void boss_shockb1(void); +void boss_shockb2(void); +void boss_shockb3(void); +void boss_shockb4(void); +void boss_shockb5(void); +void boss_shockb6(void); +void boss_shockb7(void); +void boss_shockb8(void); +void boss_shockb9(void); +void boss_shockb10(void); +void boss_shockc1(void); +void boss_shockc2(void); +void boss_shockc3(void); +void boss_shockc4(void); +void boss_shockc5(void); +void boss_shockc6(void); +void boss_shockc7(void); +void boss_shockc8(void); +void boss_shockc9(void); +void boss_shockc10(void); +void boss_death1(void); +void boss_death2(void); +void boss_death3(void); +void boss_death4(void); +void boss_death5(void); +void boss_death6(void); +void boss_death7(void); +void boss_death8(void); +void boss_death9(void); +void boss_death10(void); //============================================================================= @@ -275,7 +275,7 @@ ANIM(boss_rise15, rise15, boss_rise16;) ANIM(boss_rise16, rise16, boss_rise17;) ANIM(boss_rise17, rise17, boss_missile1;) -void boss_face() +void boss_face(void) { gedict_t *e = PROG_TO_EDICT(self->s.v.enemy); @@ -338,7 +338,7 @@ ANIM(boss_idle29, walk29, boss_idle30; boss_face();) ANIM(boss_idle30, walk30, boss_idle31; boss_face();) ANIM(boss_idle31, walk31, boss_idle1; boss_face();) -extern void T_MissileTouch(); +extern void T_MissileTouch(void); void boss_missile(float p_x, float p_y, float p_z) { @@ -472,7 +472,7 @@ ANIM(boss_death8, death8, boss_death9;) ANIM(boss_death9, death9, boss_death10; _boss_death9();) ANIM(boss_death10, death9, boss_death10; _boss_death10();) -void boss_awake() +void boss_awake(void) { self->s.v.solid = SOLID_SLIDEBOX; self->s.v.movetype = MOVETYPE_STEP; @@ -498,7 +498,7 @@ void boss_awake() /*QUAKED monster_boss (1 0 0) (-128 -128 -24) (128 128 256) */ -void SP_monster_boss() +void SP_monster_boss(void) { if (!AllowMonster(self)) { @@ -527,8 +527,8 @@ void SP_monster_boss() static float lightning_end; -extern void door_go_down(); -void lightning_fire() +extern void door_go_down(void); +void lightning_fire(void) { gedict_t *le1, *le2, *oself; vec3_t p1, p2, tmpv; @@ -594,7 +594,7 @@ void lightning_fire() WriteCoord( MSG_ALL, p2[2]); } -void lightning_use() +void lightning_use(void) { gedict_t *le1, *le2, *oself, *boss; @@ -672,7 +672,7 @@ void lightning_use() /*QUAKED event_lightning (0 1 1) (-16 -16 -16) (16 16 16) Just for boss level. */ -void SP_event_lightning() +void SP_event_lightning(void) { self->use = (func_t)lightning_use; } diff --git a/src/sp_client.c b/src/sp_client.c index 9bf77b1a..9b6b3e38 100644 --- a/src/sp_client.c +++ b/src/sp_client.c @@ -20,7 +20,7 @@ // sp_client.c - single player specific functions #include "g_local.h" -void ExitIntermission() +void ExitIntermission(void) { // skip any text in deathmatch if (deathmatch) diff --git a/src/sp_demon.c b/src/sp_demon.c index 9dafd296..a8a1efb3 100644 --- a/src/sp_demon.c +++ b/src/sp_demon.c @@ -106,75 +106,75 @@ enum }; -void demon1_stand1(); -void demon1_stand2(); -void demon1_stand3(); -void demon1_stand4(); -void demon1_stand5(); -void demon1_stand6(); -void demon1_stand7(); -void demon1_stand8(); -void demon1_stand9(); -void demon1_stand10(); -void demon1_stand11(); -void demon1_stand12(); -void demon1_stand13(); -void demon1_walk1(); -void demon1_walk2(); -void demon1_walk3(); -void demon1_walk4(); -void demon1_walk5(); -void demon1_walk6(); -void demon1_walk7(); -void demon1_walk8(); -void demon1_run1(); -void demon1_run2(); -void demon1_run3(); -void demon1_run4(); -void demon1_run5(); -void demon1_run6(); -void demon1_jump1(); -void demon1_jump2(); -void demon1_jump3(); -void demon1_jump4(); -void demon1_jump5(); -void demon1_jump6(); -void demon1_jump7(); -void demon1_jump8(); -void demon1_jump9(); -void demon1_jump10(); -void demon1_jump11(); -void demon1_jump12(); -void demon1_atta1(); -void demon1_atta2(); -void demon1_atta3(); -void demon1_atta4(); -void demon1_atta5(); -void demon1_atta6(); -void demon1_atta7(); -void demon1_atta8(); -void demon1_atta9(); -void demon1_atta10(); -void demon1_atta11(); -void demon1_atta12(); -void demon1_atta13(); -void demon1_atta14(); -void demon1_atta15(); -void demon1_pain1(); -void demon1_pain2(); -void demon1_pain3(); -void demon1_pain4(); -void demon1_pain5(); -void demon1_pain6(); -void demon1_die1(); -void demon1_die2(); -void demon1_die3(); -void demon1_die4(); -void demon1_die5(); -void demon1_die6(); -void demon1_die7(); -void demon1_die8(); -void demon1_die9(); +void demon1_stand1(void); +void demon1_stand2(void); +void demon1_stand3(void); +void demon1_stand4(void); +void demon1_stand5(void); +void demon1_stand6(void); +void demon1_stand7(void); +void demon1_stand8(void); +void demon1_stand9(void); +void demon1_stand10(void); +void demon1_stand11(void); +void demon1_stand12(void); +void demon1_stand13(void); +void demon1_walk1(void); +void demon1_walk2(void); +void demon1_walk3(void); +void demon1_walk4(void); +void demon1_walk5(void); +void demon1_walk6(void); +void demon1_walk7(void); +void demon1_walk8(void); +void demon1_run1(void); +void demon1_run2(void); +void demon1_run3(void); +void demon1_run4(void); +void demon1_run5(void); +void demon1_run6(void); +void demon1_jump1(void); +void demon1_jump2(void); +void demon1_jump3(void); +void demon1_jump4(void); +void demon1_jump5(void); +void demon1_jump6(void); +void demon1_jump7(void); +void demon1_jump8(void); +void demon1_jump9(void); +void demon1_jump10(void); +void demon1_jump11(void); +void demon1_jump12(void); +void demon1_atta1(void); +void demon1_atta2(void); +void demon1_atta3(void); +void demon1_atta4(void); +void demon1_atta5(void); +void demon1_atta6(void); +void demon1_atta7(void); +void demon1_atta8(void); +void demon1_atta9(void); +void demon1_atta10(void); +void demon1_atta11(void); +void demon1_atta12(void); +void demon1_atta13(void); +void demon1_atta14(void); +void demon1_atta15(void); +void demon1_pain1(void); +void demon1_pain2(void); +void demon1_pain3(void); +void demon1_pain4(void); +void demon1_pain5(void); +void demon1_pain6(void); +void demon1_die1(void); +void demon1_die2(void); +void demon1_die3(void); +void demon1_die4(void); +void demon1_die5(void); +void demon1_die6(void); +void demon1_die7(void); +void demon1_die8(void); +void demon1_die9(void); //============================================================================ @@ -226,7 +226,7 @@ ANIM(demon1_run4, run4, demon1_run5; ai_run(20);) ANIM(demon1_run5, run5, demon1_run6; ai_run(15);) ANIM(demon1_run6, run6, demon1_run1; ai_run(36);) -void Demon_JumpTouch() +void Demon_JumpTouch(void) { float ldmg; @@ -389,7 +389,7 @@ ANIM(demon1_die7, death7, demon1_die8) ANIM(demon1_die8, death8, demon1_die9) ANIM(demon1_die9, death9, demon1_die9) -void demon_die() +void demon_die(void) { // check for gib if (self->s.v.health < -80) @@ -418,7 +418,7 @@ void demon_die() Returns true if a melee attack would hit right now ============== */ -float CheckDemonMelee() +float CheckDemonMelee(void) { if (enemy_range == RANGE_MELEE) { @@ -437,7 +437,7 @@ float CheckDemonMelee() ============== */ -float CheckDemonJump() +float CheckDemonJump(void) { vec3_t dist; float d; @@ -479,7 +479,7 @@ float CheckDemonJump() return true; } -float DemonCheckAttack() +float DemonCheckAttack(void) { // if close enough for slashing, go for it if (CheckDemonMelee()) @@ -504,7 +504,7 @@ float DemonCheckAttack() /*QUAKED monster_demon1 (1 0 0) (-32 -32 -24) (32 32 64) Ambush */ -void SP_monster_demon1() +void SP_monster_demon1(void) { if (!AllowMonster(self)) { diff --git a/src/sp_dog.c b/src/sp_dog.c index 9a97771d..83e20acf 100644 --- a/src/sp_dog.c +++ b/src/sp_dog.c @@ -125,92 +125,92 @@ enum }; -void dog_stand1(); -void dog_stand2(); -void dog_stand3(); -void dog_stand4(); -void dog_stand5(); -void dog_stand6(); -void dog_stand7(); -void dog_stand8(); -void dog_stand9(); -void dog_walk1(); -void dog_walk2(); -void dog_walk3(); -void dog_walk4(); -void dog_walk5(); -void dog_walk6(); -void dog_walk7(); -void dog_walk8(); -void dog_run1(); -void dog_run2(); -void dog_run3(); -void dog_run4(); -void dog_run5(); -void dog_run6(); -void dog_run7(); -void dog_run8(); -void dog_run9(); -void dog_run10(); -void dog_run11(); -void dog_run12(); -void dog_atta1(); -void dog_atta2(); -void dog_atta3(); -void dog_atta4(); -void dog_atta5(); -void dog_atta6(); -void dog_atta7(); -void dog_atta8(); -void dog_leap1(); -void dog_leap2(); -void dog_leap3(); -void dog_leap4(); -void dog_leap5(); -void dog_leap6(); -void dog_leap7(); -void dog_leap8(); -void dog_leap9(); -void dog_pain1(); -void dog_pain2(); -void dog_pain3(); -void dog_pain4(); -void dog_pain5(); -void dog_pain6(); -void dog_painb1(); -void dog_painb2(); -void dog_painb3(); -void dog_painb4(); -void dog_painb5(); -void dog_painb6(); -void dog_painb7(); -void dog_painb8(); -void dog_painb9(); -void dog_painb10(); -void dog_painb11(); -void dog_painb12(); -void dog_painb13(); -void dog_painb14(); -void dog_painb15(); -void dog_painb16(); -void dog_die1(); -void dog_die2(); -void dog_die3(); -void dog_die4(); -void dog_die5(); -void dog_die6(); -void dog_die7(); -void dog_die8(); -void dog_die9(); -void dog_dieb1(); -void dog_dieb2(); -void dog_dieb3(); -void dog_dieb4(); -void dog_dieb5(); -void dog_dieb6(); -void dog_dieb7(); -void dog_dieb8(); -void dog_dieb9(); +void dog_stand1(void); +void dog_stand2(void); +void dog_stand3(void); +void dog_stand4(void); +void dog_stand5(void); +void dog_stand6(void); +void dog_stand7(void); +void dog_stand8(void); +void dog_stand9(void); +void dog_walk1(void); +void dog_walk2(void); +void dog_walk3(void); +void dog_walk4(void); +void dog_walk5(void); +void dog_walk6(void); +void dog_walk7(void); +void dog_walk8(void); +void dog_run1(void); +void dog_run2(void); +void dog_run3(void); +void dog_run4(void); +void dog_run5(void); +void dog_run6(void); +void dog_run7(void); +void dog_run8(void); +void dog_run9(void); +void dog_run10(void); +void dog_run11(void); +void dog_run12(void); +void dog_atta1(void); +void dog_atta2(void); +void dog_atta3(void); +void dog_atta4(void); +void dog_atta5(void); +void dog_atta6(void); +void dog_atta7(void); +void dog_atta8(void); +void dog_leap1(void); +void dog_leap2(void); +void dog_leap3(void); +void dog_leap4(void); +void dog_leap5(void); +void dog_leap6(void); +void dog_leap7(void); +void dog_leap8(void); +void dog_leap9(void); +void dog_pain1(void); +void dog_pain2(void); +void dog_pain3(void); +void dog_pain4(void); +void dog_pain5(void); +void dog_pain6(void); +void dog_painb1(void); +void dog_painb2(void); +void dog_painb3(void); +void dog_painb4(void); +void dog_painb5(void); +void dog_painb6(void); +void dog_painb7(void); +void dog_painb8(void); +void dog_painb9(void); +void dog_painb10(void); +void dog_painb11(void); +void dog_painb12(void); +void dog_painb13(void); +void dog_painb14(void); +void dog_painb15(void); +void dog_painb16(void); +void dog_die1(void); +void dog_die2(void); +void dog_die3(void); +void dog_die4(void); +void dog_die5(void); +void dog_die6(void); +void dog_die7(void); +void dog_die8(void); +void dog_die9(void); +void dog_dieb1(void); +void dog_dieb2(void); +void dog_dieb3(void); +void dog_dieb4(void); +void dog_dieb5(void); +void dog_dieb6(void); +void dog_dieb7(void); +void dog_dieb8(void); +void dog_dieb9(void); ANIM(dog_stand1, stand1, dog_stand2; ai_stand();) ANIM(dog_stand2, stand2, dog_stand3; ai_stand();) @@ -248,7 +248,7 @@ ANIM(dog_run10, run10, dog_run11; ai_run(32);) ANIM(dog_run11, run11, dog_run12; ai_run(32);) ANIM(dog_run12, run12, dog_run1; ai_run(32);) -void dog_bite() +void dog_bite(void) { vec3_t delta; float ldmg; @@ -289,7 +289,7 @@ ANIM(dog_atta6, attack6, dog_atta7; ai_charge(10);) ANIM(dog_atta7, attack7, dog_atta8; ai_charge(10);) ANIM(dog_atta8, attack8, dog_run1; ai_charge(10);) -void Dog_JumpTouch() +void Dog_JumpTouch(void) { float ldmg; @@ -331,7 +331,7 @@ void Dog_JumpTouch() self->s.v.nextthink = g_globalvars.time + FRAMETIME; } -void _dog_leap2() +void _dog_leap2(void) { ai_face(); @@ -342,7 +342,7 @@ void _dog_leap2() self->s.v.velocity[2] += 200; self->s.v.flags = (int)self->s.v.flags & ~FL_ONGROUND; } -void _dog_leap9() +void _dog_leap9(void) { // put monster back in run state after 3 seconds, actually it should never/rare happend self->s.v.nextthink = g_globalvars.time + 3; @@ -416,7 +416,7 @@ ANIM(dog_dieb7, deathb7, dog_dieb8) ANIM(dog_dieb8, deathb8, dog_dieb9) ANIM(dog_dieb9, deathb9, dog_dieb9) -void dog_die() +void dog_die(void) { // check for gib if (self->s.v.health < -35) @@ -455,7 +455,7 @@ void dog_die() Returns true if a melee attack would hit right now ============== */ -float CheckDogMelee() +float CheckDogMelee(void) { if (enemy_range == RANGE_MELEE) { @@ -474,7 +474,7 @@ float CheckDogMelee() ============== */ -float CheckDogJump() +float CheckDogJump(void) { vec3_t dist; float d; @@ -513,7 +513,7 @@ float CheckDogJump() return true; } -float DogCheckAttack() +float DogCheckAttack(void) { // if close enough for slashing, go for it if (CheckDogMelee()) @@ -538,7 +538,7 @@ float DogCheckAttack() /*QUAKED monster_dog (1 0 0) (-32 -32 -24) (32 32 40) Ambush */ -void SP_monster_dog() +void SP_monster_dog(void) { if (!AllowMonster(self)) { diff --git a/src/sp_enforcer.c b/src/sp_enforcer.c index 686af73d..b70e4c8d 100644 --- a/src/sp_enforcer.c +++ b/src/sp_enforcer.c @@ -142,112 +142,112 @@ enum }; -void enf_stand1(); -void enf_stand2(); -void enf_stand3(); -void enf_stand4(); -void enf_stand5(); -void enf_stand6(); -void enf_stand7(); -void enf_walk1(); -void enf_walk2(); -void enf_walk3(); -void enf_walk4(); -void enf_walk5(); -void enf_walk6(); -void enf_walk7(); -void enf_walk8(); -void enf_walk9(); -void enf_walk10(); -void enf_walk11(); -void enf_walk12(); -void enf_walk13(); -void enf_walk14(); -void enf_walk15(); -void enf_walk16(); -void enf_run1(); -void enf_run2(); -void enf_run3(); -void enf_run4(); -void enf_run5(); -void enf_run6(); -void enf_run7(); -void enf_run8(); -void enf_atk1(); -void enf_atk2(); -void enf_atk3(); -void enf_atk4(); -void enf_atk5(); -void enf_atk6(); -void enf_atk7(); -void enf_atk8(); -void enf_atk9(); -void enf_atk10(); -void enf_atk11(); -void enf_atk12(); -void enf_atk13(); -void enf_atk14(); -void enf_paina1(); -void enf_paina2(); -void enf_paina3(); -void enf_paina4(); -void enf_painb1(); -void enf_painb2(); -void enf_painb3(); -void enf_painb4(); -void enf_painb5(); -void enf_painc1(); -void enf_painc2(); -void enf_painc3(); -void enf_painc4(); -void enf_painc5(); -void enf_painc6(); -void enf_painc7(); -void enf_painc8(); -void enf_paind1(); -void enf_paind2(); -void enf_paind3(); -void enf_paind4(); -void enf_paind5(); -void enf_paind6(); -void enf_paind7(); -void enf_paind8(); -void enf_paind9(); -void enf_paind10(); -void enf_paind11(); -void enf_paind12(); -void enf_paind13(); -void enf_paind14(); -void enf_paind15(); -void enf_paind16(); -void enf_paind17(); -void enf_paind18(); -void enf_paind19(); -void enf_die1(); -void enf_die2(); -void enf_die3(); -void enf_die4(); -void enf_die5(); -void enf_die6(); -void enf_die7(); -void enf_die8(); -void enf_die9(); -void enf_die10(); -void enf_die11(); -void enf_die12(); -void enf_die13(); -void enf_die14(); -void enf_fdie1(); -void enf_fdie2(); -void enf_fdie3(); -void enf_fdie4(); -void enf_fdie5(); -void enf_fdie6(); -void enf_fdie7(); -void enf_fdie8(); -void enf_fdie9(); -void enf_fdie10(); -void enf_fdie11(); +void enf_stand1(void); +void enf_stand2(void); +void enf_stand3(void); +void enf_stand4(void); +void enf_stand5(void); +void enf_stand6(void); +void enf_stand7(void); +void enf_walk1(void); +void enf_walk2(void); +void enf_walk3(void); +void enf_walk4(void); +void enf_walk5(void); +void enf_walk6(void); +void enf_walk7(void); +void enf_walk8(void); +void enf_walk9(void); +void enf_walk10(void); +void enf_walk11(void); +void enf_walk12(void); +void enf_walk13(void); +void enf_walk14(void); +void enf_walk15(void); +void enf_walk16(void); +void enf_run1(void); +void enf_run2(void); +void enf_run3(void); +void enf_run4(void); +void enf_run5(void); +void enf_run6(void); +void enf_run7(void); +void enf_run8(void); +void enf_atk1(void); +void enf_atk2(void); +void enf_atk3(void); +void enf_atk4(void); +void enf_atk5(void); +void enf_atk6(void); +void enf_atk7(void); +void enf_atk8(void); +void enf_atk9(void); +void enf_atk10(void); +void enf_atk11(void); +void enf_atk12(void); +void enf_atk13(void); +void enf_atk14(void); +void enf_paina1(void); +void enf_paina2(void); +void enf_paina3(void); +void enf_paina4(void); +void enf_painb1(void); +void enf_painb2(void); +void enf_painb3(void); +void enf_painb4(void); +void enf_painb5(void); +void enf_painc1(void); +void enf_painc2(void); +void enf_painc3(void); +void enf_painc4(void); +void enf_painc5(void); +void enf_painc6(void); +void enf_painc7(void); +void enf_painc8(void); +void enf_paind1(void); +void enf_paind2(void); +void enf_paind3(void); +void enf_paind4(void); +void enf_paind5(void); +void enf_paind6(void); +void enf_paind7(void); +void enf_paind8(void); +void enf_paind9(void); +void enf_paind10(void); +void enf_paind11(void); +void enf_paind12(void); +void enf_paind13(void); +void enf_paind14(void); +void enf_paind15(void); +void enf_paind16(void); +void enf_paind17(void); +void enf_paind18(void); +void enf_paind19(void); +void enf_die1(void); +void enf_die2(void); +void enf_die3(void); +void enf_die4(void); +void enf_die5(void); +void enf_die6(void); +void enf_die7(void); +void enf_die8(void); +void enf_die9(void); +void enf_die10(void); +void enf_die11(void); +void enf_die12(void); +void enf_die13(void); +void enf_die14(void); +void enf_fdie1(void); +void enf_fdie2(void); +void enf_fdie3(void); +void enf_fdie4(void); +void enf_fdie5(void); +void enf_fdie6(void); +void enf_fdie7(void); +void enf_fdie8(void); +void enf_fdie9(void); +void enf_fdie10(void); +void enf_fdie11(void); //============================================================================ @@ -303,7 +303,7 @@ ANIM(enf_run6, run6, enf_run7; ai_run(14);) ANIM(enf_run7, run7, enf_run8; ai_run(7);) ANIM(enf_run8, run8, enf_run1; ai_run(11);) -void enforcer_fire() +void enforcer_fire(void) { vec3_t org, delta; @@ -456,7 +456,7 @@ ANIM(enf_fdie9, fdeath9, enf_fdie10) ANIM(enf_fdie10, fdeath10, enf_fdie11) ANIM(enf_fdie11, fdeath11, enf_fdie11) -void enf_die() +void enf_die(void) { // check for gib if (self->s.v.health < -35) @@ -491,7 +491,7 @@ void enf_die() /*QUAKED monster_enforcer (1 0 0) (-16 -16 -24) (16 16 40) Ambush */ -void SP_monster_enforcer() +void SP_monster_enforcer(void) { if (!AllowMonster(self)) { diff --git a/src/sp_fish.c b/src/sp_fish.c index 7965ab98..c59dbf0e 100644 --- a/src/sp_fish.c +++ b/src/sp_fish.c @@ -101,99 +101,99 @@ enum }; -void f_stand1(); -void f_stand2(); -void f_stand3(); -void f_stand4(); -void f_stand5(); -void f_stand6(); -void f_stand7(); -void f_stand8(); -void f_stand9(); -void f_stand10(); -void f_stand11(); -void f_stand12(); -void f_stand13(); -void f_stand14(); -void f_stand15(); -void f_stand16(); -void f_stand17(); -void f_stand18(); -void f_walk1(); -void f_walk2(); -void f_walk3(); -void f_walk4(); -void f_walk5(); -void f_walk6(); -void f_walk7(); -void f_walk8(); -void f_walk9(); -void f_walk10(); -void f_walk11(); -void f_walk12(); -void f_walk13(); -void f_walk14(); -void f_walk15(); -void f_walk16(); -void f_walk17(); -void f_walk18(); -void f_run1(); -void f_run2(); -void f_run3(); -void f_run4(); -void f_run5(); -void f_run6(); -void f_run7(); -void f_run8(); -void f_run9(); -void f_attack1(); -void f_attack2(); -void f_attack3(); -void f_attack4(); -void f_attack5(); -void f_attack6(); -void f_attack7(); -void f_attack8(); -void f_attack9(); -void f_attack10(); -void f_attack11(); -void f_attack12(); -void f_attack13(); -void f_attack14(); -void f_attack15(); -void f_attack16(); -void f_attack17(); -void f_attack18(); -void f_death1(); -void f_death2(); -void f_death3(); -void f_death4(); -void f_death5(); -void f_death6(); -void f_death7(); -void f_death8(); -void f_death9(); -void f_death10(); -void f_death11(); -void f_death12(); -void f_death13(); -void f_death14(); -void f_death15(); -void f_death16(); -void f_death17(); -void f_death18(); -void f_death19(); -void f_death20(); -void f_death21(); -void f_pain1(); -void f_pain2(); -void f_pain3(); -void f_pain4(); -void f_pain5(); -void f_pain6(); -void f_pain7(); -void f_pain8(); -void f_pain9(); +void f_stand1(void); +void f_stand2(void); +void f_stand3(void); +void f_stand4(void); +void f_stand5(void); +void f_stand6(void); +void f_stand7(void); +void f_stand8(void); +void f_stand9(void); +void f_stand10(void); +void f_stand11(void); +void f_stand12(void); +void f_stand13(void); +void f_stand14(void); +void f_stand15(void); +void f_stand16(void); +void f_stand17(void); +void f_stand18(void); +void f_walk1(void); +void f_walk2(void); +void f_walk3(void); +void f_walk4(void); +void f_walk5(void); +void f_walk6(void); +void f_walk7(void); +void f_walk8(void); +void f_walk9(void); +void f_walk10(void); +void f_walk11(void); +void f_walk12(void); +void f_walk13(void); +void f_walk14(void); +void f_walk15(void); +void f_walk16(void); +void f_walk17(void); +void f_walk18(void); +void f_run1(void); +void f_run2(void); +void f_run3(void); +void f_run4(void); +void f_run5(void); +void f_run6(void); +void f_run7(void); +void f_run8(void); +void f_run9(void); +void f_attack1(void); +void f_attack2(void); +void f_attack3(void); +void f_attack4(void); +void f_attack5(void); +void f_attack6(void); +void f_attack7(void); +void f_attack8(void); +void f_attack9(void); +void f_attack10(void); +void f_attack11(void); +void f_attack12(void); +void f_attack13(void); +void f_attack14(void); +void f_attack15(void); +void f_attack16(void); +void f_attack17(void); +void f_attack18(void); +void f_death1(void); +void f_death2(void); +void f_death3(void); +void f_death4(void); +void f_death5(void); +void f_death6(void); +void f_death7(void); +void f_death8(void); +void f_death9(void); +void f_death10(void); +void f_death11(void); +void f_death12(void); +void f_death13(void); +void f_death14(void); +void f_death15(void); +void f_death16(void); +void f_death17(void); +void f_death18(void); +void f_death19(void); +void f_death20(void); +void f_death21(void); +void f_pain1(void); +void f_pain2(void); +void f_pain3(void); +void f_pain4(void); +void f_pain5(void); +void f_pain6(void); +void f_pain7(void); +void f_pain8(void); +void f_pain9(void); //============================================================================== @@ -269,15 +269,15 @@ ANIM(f_run9, swim17, f_run1; ai_run(12);) #else -void f_run10(); -void f_run11(); -void f_run12(); -void f_run13(); -void f_run14(); -void f_run15(); -void f_run16(); -void f_run17(); -void f_run18(); +void f_run10(void); +void f_run11(void); +void f_run12(void); +void f_run13(void); +void f_run14(void); +void f_run15(void); +void f_run16(void); +void f_run17(void); +void f_run18(void); ANIM(f_run1, swim1, f_run2; _f_run1();) ANIM(f_run2, swim2, f_run3; ai_run(12);) @@ -406,7 +406,7 @@ void fish_pain(struct gedict_s *attacker, float damage) /*QUAKED monster_fish (1 0 0) (-16 -16 -24) (16 16 24) Ambush */ -void SP_monster_fish() +void SP_monster_fish(void) { if (!AllowMonster(self)) { diff --git a/src/sp_hknight.c b/src/sp_hknight.c index 0f43ae0a..a754a45e 100644 --- a/src/sp_hknight.c +++ b/src/sp_hknight.c @@ -210,178 +210,178 @@ enum }; -void hknight_stand1(); -void hknight_stand2(); -void hknight_stand3(); -void hknight_stand4(); -void hknight_stand5(); -void hknight_stand6(); -void hknight_stand7(); -void hknight_stand8(); -void hknight_stand9(); -void hknight_walk1(); -void hknight_walk2(); -void hknight_walk3(); -void hknight_walk4(); -void hknight_walk5(); -void hknight_walk6(); -void hknight_walk7(); -void hknight_walk8(); -void hknight_walk9(); -void hknight_walk10(); -void hknight_walk11(); -void hknight_walk12(); -void hknight_walk13(); -void hknight_walk14(); -void hknight_walk15(); -void hknight_walk16(); -void hknight_walk17(); -void hknight_walk18(); -void hknight_walk19(); -void hknight_walk20(); -void hknight_run1(); -void hknight_run2(); -void hknight_run3(); -void hknight_run4(); -void hknight_run5(); -void hknight_run6(); -void hknight_run7(); -void hknight_run8(); -void hknight_pain1(); -void hknight_pain2(); -void hknight_pain3(); -void hknight_pain4(); -void hknight_pain5(); -void hknight_die1(); -void hknight_die2(); -void hknight_die3(); -void hknight_die4(); -void hknight_die5(); -void hknight_die6(); -void hknight_die7(); -void hknight_die8(); -void hknight_die9(); -void hknight_die10(); -void hknight_die11(); -void hknight_die12(); -void hknight_dieb1(); -void hknight_dieb2(); -void hknight_dieb3(); -void hknight_dieb4(); -void hknight_dieb5(); -void hknight_dieb6(); -void hknight_dieb7(); -void hknight_dieb8(); -void hknight_dieb9(); -void hknight_magica1(); -void hknight_magica2(); -void hknight_magica3(); -void hknight_magica4(); -void hknight_magica5(); -void hknight_magica6(); -void hknight_magica7(); -void hknight_magica8(); -void hknight_magica9(); -void hknight_magica10(); -void hknight_magica11(); -void hknight_magica12(); -void hknight_magica13(); -void hknight_magica14(); -void hknight_magicb1(); -void hknight_magicb2(); -void hknight_magicb3(); -void hknight_magicb4(); -void hknight_magicb5(); -void hknight_magicb6(); -void hknight_magicb7(); -void hknight_magicb8(); -void hknight_magicb9(); -void hknight_magicb10(); -void hknight_magicb11(); -void hknight_magicb12(); -void hknight_magicb13(); -void hknight_magicc1(); -void hknight_magicc2(); -void hknight_magicc3(); -void hknight_magicc4(); -void hknight_magicc5(); -void hknight_magicc6(); -void hknight_magicc7(); -void hknight_magicc8(); -void hknight_magicc9(); -void hknight_magicc10(); -void hknight_magicc11(); -void hknight_char_a1(); -void hknight_char_a2(); -void hknight_char_a3(); -void hknight_char_a4(); -void hknight_char_a5(); -void hknight_char_a6(); -void hknight_char_a7(); -void hknight_char_a8(); -void hknight_char_a9(); -void hknight_char_a10(); -void hknight_char_a11(); -void hknight_char_a12(); -void hknight_char_a13(); -void hknight_char_a14(); -void hknight_char_a15(); -void hknight_char_a16(); -void hknight_char_b1(); -void hknight_char_b2(); -void hknight_char_b3(); -void hknight_char_b4(); -void hknight_char_b5(); -void hknight_char_b6(); -void hknight_slice1(); -void hknight_slice2(); -void hknight_slice3(); -void hknight_slice4(); -void hknight_slice5(); -void hknight_slice6(); -void hknight_slice7(); -void hknight_slice8(); -void hknight_slice9(); -void hknight_slice10(); -void hknight_smash1(); -void hknight_smash2(); -void hknight_smash3(); -void hknight_smash4(); -void hknight_smash5(); -void hknight_smash6(); -void hknight_smash7(); -void hknight_smash8(); -void hknight_smash9(); -void hknight_smash10(); -void hknight_smash11(); -void hknight_watk1(); -void hknight_watk2(); -void hknight_watk3(); -void hknight_watk4(); -void hknight_watk5(); -void hknight_watk6(); -void hknight_watk7(); -void hknight_watk8(); -void hknight_watk9(); -void hknight_watk10(); -void hknight_watk11(); -void hknight_watk12(); -void hknight_watk13(); -void hknight_watk14(); -void hknight_watk15(); -void hknight_watk16(); -void hknight_watk17(); -void hknight_watk18(); -void hknight_watk19(); -void hknight_watk20(); -void hknight_watk21(); -void hknight_watk22(); +void hknight_stand1(void); +void hknight_stand2(void); +void hknight_stand3(void); +void hknight_stand4(void); +void hknight_stand5(void); +void hknight_stand6(void); +void hknight_stand7(void); +void hknight_stand8(void); +void hknight_stand9(void); +void hknight_walk1(void); +void hknight_walk2(void); +void hknight_walk3(void); +void hknight_walk4(void); +void hknight_walk5(void); +void hknight_walk6(void); +void hknight_walk7(void); +void hknight_walk8(void); +void hknight_walk9(void); +void hknight_walk10(void); +void hknight_walk11(void); +void hknight_walk12(void); +void hknight_walk13(void); +void hknight_walk14(void); +void hknight_walk15(void); +void hknight_walk16(void); +void hknight_walk17(void); +void hknight_walk18(void); +void hknight_walk19(void); +void hknight_walk20(void); +void hknight_run1(void); +void hknight_run2(void); +void hknight_run3(void); +void hknight_run4(void); +void hknight_run5(void); +void hknight_run6(void); +void hknight_run7(void); +void hknight_run8(void); +void hknight_pain1(void); +void hknight_pain2(void); +void hknight_pain3(void); +void hknight_pain4(void); +void hknight_pain5(void); +void hknight_die1(void); +void hknight_die2(void); +void hknight_die3(void); +void hknight_die4(void); +void hknight_die5(void); +void hknight_die6(void); +void hknight_die7(void); +void hknight_die8(void); +void hknight_die9(void); +void hknight_die10(void); +void hknight_die11(void); +void hknight_die12(void); +void hknight_dieb1(void); +void hknight_dieb2(void); +void hknight_dieb3(void); +void hknight_dieb4(void); +void hknight_dieb5(void); +void hknight_dieb6(void); +void hknight_dieb7(void); +void hknight_dieb8(void); +void hknight_dieb9(void); +void hknight_magica1(void); +void hknight_magica2(void); +void hknight_magica3(void); +void hknight_magica4(void); +void hknight_magica5(void); +void hknight_magica6(void); +void hknight_magica7(void); +void hknight_magica8(void); +void hknight_magica9(void); +void hknight_magica10(void); +void hknight_magica11(void); +void hknight_magica12(void); +void hknight_magica13(void); +void hknight_magica14(void); +void hknight_magicb1(void); +void hknight_magicb2(void); +void hknight_magicb3(void); +void hknight_magicb4(void); +void hknight_magicb5(void); +void hknight_magicb6(void); +void hknight_magicb7(void); +void hknight_magicb8(void); +void hknight_magicb9(void); +void hknight_magicb10(void); +void hknight_magicb11(void); +void hknight_magicb12(void); +void hknight_magicb13(void); +void hknight_magicc1(void); +void hknight_magicc2(void); +void hknight_magicc3(void); +void hknight_magicc4(void); +void hknight_magicc5(void); +void hknight_magicc6(void); +void hknight_magicc7(void); +void hknight_magicc8(void); +void hknight_magicc9(void); +void hknight_magicc10(void); +void hknight_magicc11(void); +void hknight_char_a1(void); +void hknight_char_a2(void); +void hknight_char_a3(void); +void hknight_char_a4(void); +void hknight_char_a5(void); +void hknight_char_a6(void); +void hknight_char_a7(void); +void hknight_char_a8(void); +void hknight_char_a9(void); +void hknight_char_a10(void); +void hknight_char_a11(void); +void hknight_char_a12(void); +void hknight_char_a13(void); +void hknight_char_a14(void); +void hknight_char_a15(void); +void hknight_char_a16(void); +void hknight_char_b1(void); +void hknight_char_b2(void); +void hknight_char_b3(void); +void hknight_char_b4(void); +void hknight_char_b5(void); +void hknight_char_b6(void); +void hknight_slice1(void); +void hknight_slice2(void); +void hknight_slice3(void); +void hknight_slice4(void); +void hknight_slice5(void); +void hknight_slice6(void); +void hknight_slice7(void); +void hknight_slice8(void); +void hknight_slice9(void); +void hknight_slice10(void); +void hknight_smash1(void); +void hknight_smash2(void); +void hknight_smash3(void); +void hknight_smash4(void); +void hknight_smash5(void); +void hknight_smash6(void); +void hknight_smash7(void); +void hknight_smash8(void); +void hknight_smash9(void); +void hknight_smash10(void); +void hknight_smash11(void); +void hknight_watk1(void); +void hknight_watk2(void); +void hknight_watk3(void); +void hknight_watk4(void); +void hknight_watk5(void); +void hknight_watk6(void); +void hknight_watk7(void); +void hknight_watk8(void); +void hknight_watk9(void); +void hknight_watk10(void); +void hknight_watk11(void); +void hknight_watk12(void); +void hknight_watk13(void); +void hknight_watk14(void); +void hknight_watk15(void); +void hknight_watk16(void); +void hknight_watk17(void); +void hknight_watk18(void); +void hknight_watk19(void); +void hknight_watk20(void); +void hknight_watk21(void); +void hknight_watk22(void); //=========================================================================== // used by both walk and run -void hk_idle_sound() +void hk_idle_sound(void) { if (g_random() < 0.2) sound(self, CHAN_VOICE, "hknight/idle.wav", 1, ATTN_NORM); @@ -431,7 +431,7 @@ ANIM(hknight_walk20, walk20, hknight_walk1; ai_walk(2);) //=========================================================================== -void CheckForCharge() +void CheckForCharge(void) { vec3_t delta; @@ -544,7 +544,7 @@ ANIM(hknight_dieb7, deathb7, hknight_dieb8;) ANIM(hknight_dieb8, deathb8, hknight_dieb9;) ANIM(hknight_dieb9, deathb9, hknight_dieb9;) -void hknight_die() +void hknight_die(void) { // check for gib if (self->s.v.health < -40) @@ -665,7 +665,7 @@ ANIM(hknight_char_a14, char_a14, hknight_char_a15; ai_charge(25);) ANIM(hknight_char_a15, char_a15, hknight_char_a16; ai_charge(21);) ANIM(hknight_char_a16, char_a16, hknight_run1; ai_charge(13);) -void CheckContinueCharge() +void CheckContinueCharge(void) { if (g_globalvars.time > self->attack_finished) { @@ -742,7 +742,7 @@ ANIM(hknight_watk22, w_attack22, hknight_run1; ai_charge(3);) static int hknight_type; // FIXME; may be made it per one knight, but not shared for all knights right it now? -void hknight_melee() +void hknight_melee(void) { hknight_type++; hknight_type %= 3; @@ -769,7 +769,7 @@ void hknight_melee() /*QUAKED monster_hell_knight (1 0 0) (-16 -16 -24) (16 16 40) Ambush */ -void SP_monster_hell_knight() +void SP_monster_hell_knight(void) { if (!AllowMonster(self)) { diff --git a/src/sp_knight.c b/src/sp_knight.c index 4f4a3f94..c09fb8f2 100644 --- a/src/sp_knight.c +++ b/src/sp_knight.c @@ -135,93 +135,93 @@ enum }; -void knight_stand1(); -void knight_stand2(); -void knight_stand3(); -void knight_stand4(); -void knight_stand5(); -void knight_stand6(); -void knight_stand7(); -void knight_stand8(); -void knight_stand9(); -void knight_walk1(); -void knight_walk2(); -void knight_walk3(); -void knight_walk4(); -void knight_walk5(); -void knight_walk6(); -void knight_walk7(); -void knight_walk8(); -void knight_walk9(); -void knight_walk10(); -void knight_walk11(); -void knight_walk12(); -void knight_walk13(); -void knight_walk14(); -void knight_run1(); -void knight_run2(); -void knight_run3(); -void knight_run4(); -void knight_run5(); -void knight_run6(); -void knight_run7(); -void knight_run8(); -void knight_runatk1(); -void knight_runatk2(); -void knight_runatk3(); -void knight_runatk4(); -void knight_runatk5(); -void knight_runatk6(); -void knight_runatk7(); -void knight_runatk8(); -void knight_runatk9(); -void knight_runatk10(); -void knight_runatk11(); -void knight_atk1(); -void knight_atk2(); -void knight_atk3(); -void knight_atk4(); -void knight_atk5(); -void knight_atk6(); -void knight_atk7(); -void knight_atk8(); -void knight_atk9(); -void knight_atk10(); -void knight_pain1(); -void knight_pain2(); -void knight_pain3(); -void knight_painb1(); -void knight_painb2(); -void knight_painb3(); -void knight_painb4(); -void knight_painb5(); -void knight_painb6(); -void knight_painb7(); -void knight_painb8(); -void knight_painb9(); -void knight_painb10(); -void knight_painb11(); -void knight_die1(); -void knight_die2(); -void knight_die3(); -void knight_die4(); -void knight_die5(); -void knight_die6(); -void knight_die7(); -void knight_die8(); -void knight_die9(); -void knight_die10(); -void knight_dieb1(); -void knight_dieb2(); -void knight_dieb3(); -void knight_dieb4(); -void knight_dieb5(); -void knight_dieb6(); -void knight_dieb7(); -void knight_dieb8(); -void knight_dieb9(); -void knight_dieb10(); -void knight_dieb11(); +void knight_stand1(void); +void knight_stand2(void); +void knight_stand3(void); +void knight_stand4(void); +void knight_stand5(void); +void knight_stand6(void); +void knight_stand7(void); +void knight_stand8(void); +void knight_stand9(void); +void knight_walk1(void); +void knight_walk2(void); +void knight_walk3(void); +void knight_walk4(void); +void knight_walk5(void); +void knight_walk6(void); +void knight_walk7(void); +void knight_walk8(void); +void knight_walk9(void); +void knight_walk10(void); +void knight_walk11(void); +void knight_walk12(void); +void knight_walk13(void); +void knight_walk14(void); +void knight_run1(void); +void knight_run2(void); +void knight_run3(void); +void knight_run4(void); +void knight_run5(void); +void knight_run6(void); +void knight_run7(void); +void knight_run8(void); +void knight_runatk1(void); +void knight_runatk2(void); +void knight_runatk3(void); +void knight_runatk4(void); +void knight_runatk5(void); +void knight_runatk6(void); +void knight_runatk7(void); +void knight_runatk8(void); +void knight_runatk9(void); +void knight_runatk10(void); +void knight_runatk11(void); +void knight_atk1(void); +void knight_atk2(void); +void knight_atk3(void); +void knight_atk4(void); +void knight_atk5(void); +void knight_atk6(void); +void knight_atk7(void); +void knight_atk8(void); +void knight_atk9(void); +void knight_atk10(void); +void knight_pain1(void); +void knight_pain2(void); +void knight_pain3(void); +void knight_painb1(void); +void knight_painb2(void); +void knight_painb3(void); +void knight_painb4(void); +void knight_painb5(void); +void knight_painb6(void); +void knight_painb7(void); +void knight_painb8(void); +void knight_painb9(void); +void knight_painb10(void); +void knight_painb11(void); +void knight_die1(void); +void knight_die2(void); +void knight_die3(void); +void knight_die4(void); +void knight_die5(void); +void knight_die6(void); +void knight_die7(void); +void knight_die8(void); +void knight_die9(void); +void knight_die10(void); +void knight_dieb1(void); +void knight_dieb2(void); +void knight_dieb3(void); +void knight_dieb4(void); +void knight_dieb5(void); +void knight_dieb6(void); +void knight_dieb7(void); +void knight_dieb8(void); +void knight_dieb9(void); +void knight_dieb10(void); +void knight_dieb11(void); //============================================================================== @@ -322,7 +322,7 @@ ANIM(knight_atk8, attackb8, knight_atk9; ai_charge(3); ai_melee();) ANIM(knight_atk9, attackb9, knight_atk10; ai_charge(1);) ANIM(knight_atk10, attackb10, knight_run1; ai_charge(5);) -void knight_melee() +void knight_melee(void) { vec3_t delta; @@ -407,7 +407,7 @@ ANIM(knight_dieb9, deathb9, knight_dieb10) ANIM(knight_dieb10, deathb10, knight_dieb11) ANIM(knight_dieb11, deathb11, knight_dieb11) -void knight_die() +void knight_die(void) { // check for gib if (self->s.v.health < -40) @@ -440,7 +440,7 @@ void knight_die() /*QUAKED monster_knight (1 0 0) (-16 -16 -24) (16 16 40) Ambush */ -void SP_monster_knight() +void SP_monster_knight(void) { if (!AllowMonster(self)) { diff --git a/src/sp_monsters.c b/src/sp_monsters.c index a58dc565..c9834435 100644 --- a/src/sp_monsters.c +++ b/src/sp_monsters.c @@ -113,7 +113,7 @@ static void safe_ent_remove(gedict_t *t) ent_remove(t); } -void SP_info_monster_start() +void SP_info_monster_start(void) { if (deathmatch) { @@ -638,7 +638,7 @@ void bloodfest_think(void) //============================================================================ -void MonsterDropPowerups() +void MonsterDropPowerups(void) { int i; @@ -694,7 +694,7 @@ void MonsterDropPowerups() Using a monster makes it angry at the current activator ================ */ -void monster_use() +void monster_use(void) { if (self->s.v.enemy) { @@ -735,7 +735,7 @@ void monster_use() enemy as activator. ================ */ -void monster_death_use() +void monster_death_use(void) { if (!((int)self->s.v.flags & FL_MONSTER)) { @@ -981,17 +981,17 @@ void monster_start_go(monsterType_t mt) self->s.v.nextthink = g_globalvars.time + g_random() * 0.5; } -void walkmonster_start_go() +void walkmonster_start_go(void) { monster_start_go(mtWalk); } -void flymonster_start_go() +void flymonster_start_go(void) { monster_start_go(mtFly); } -void swimmonster_start_go() +void swimmonster_start_go(void) { monster_start_go(mtSwim); } @@ -1037,7 +1037,7 @@ void bloodfest_speedup_monster_spawn(void) } self->s.v.nextthink = g_globalvars.time; - ((void (*)())(self->think))(); + ((void (*)(void))(self->think))(); } void walkmonster_start(char *model) diff --git a/src/sp_ogre.c b/src/sp_ogre.c index a367c9a5..2e8a8e1c 100644 --- a/src/sp_ogre.c +++ b/src/sp_ogre.c @@ -191,143 +191,143 @@ enum }; -void ogre_stand1(); -void ogre_stand2(); -void ogre_stand3(); -void ogre_stand4(); -void ogre_stand5(); -void ogre_stand6(); -void ogre_stand7(); -void ogre_stand8(); -void ogre_stand9(); -void ogre_walk1(); -void ogre_walk2(); -void ogre_walk3(); -void ogre_walk4(); -void ogre_walk5(); -void ogre_walk6(); -void ogre_walk7(); -void ogre_walk8(); -void ogre_walk9(); -void ogre_walk10(); -void ogre_walk11(); -void ogre_walk12(); -void ogre_walk13(); -void ogre_walk14(); -void ogre_walk15(); -void ogre_walk16(); -void ogre_run1(); -void ogre_run2(); -void ogre_run3(); -void ogre_run4(); -void ogre_run5(); -void ogre_run6(); -void ogre_run7(); -void ogre_run8(); -void ogre_swing1(); -void ogre_swing2(); -void ogre_swing3(); -void ogre_swing4(); -void ogre_swing5(); -void ogre_swing6(); -void ogre_swing7(); -void ogre_swing8(); -void ogre_swing9(); -void ogre_swing10(); -void ogre_swing11(); -void ogre_swing12(); -void ogre_swing13(); -void ogre_swing14(); -void ogre_smash1(); -void ogre_smash2(); -void ogre_smash3(); -void ogre_smash4(); -void ogre_smash5(); -void ogre_smash6(); -void ogre_smash7(); -void ogre_smash8(); -void ogre_smash9(); -void ogre_smash10(); -void ogre_smash11(); -void ogre_smash12(); -void ogre_smash13(); -void ogre_smash14(); -void ogre_nail1(); -void ogre_nail2(); -void ogre_nail3(); -void ogre_nail4(); -void ogre_nail5(); -void ogre_nail6(); -void ogre_nail7(); -void ogre_pain1(); -void ogre_pain2(); -void ogre_pain3(); -void ogre_pain4(); -void ogre_pain5(); -void ogre_painb1(); -void ogre_painb2(); -void ogre_painb3(); -void ogre_painc1(); -void ogre_painc2(); -void ogre_painc3(); -void ogre_painc4(); -void ogre_painc5(); -void ogre_painc6(); -void ogre_paind1(); -void ogre_paind2(); -void ogre_paind3(); -void ogre_paind4(); -void ogre_paind5(); -void ogre_paind6(); -void ogre_paind7(); -void ogre_paind8(); -void ogre_paind9(); -void ogre_paind10(); -void ogre_paind11(); -void ogre_paind12(); -void ogre_paind13(); -void ogre_paind14(); -void ogre_paind15(); -void ogre_paind16(); -void ogre_paine1(); -void ogre_paine2(); -void ogre_paine3(); -void ogre_paine4(); -void ogre_paine5(); -void ogre_paine6(); -void ogre_paine7(); -void ogre_paine8(); -void ogre_paine9(); -void ogre_paine10(); -void ogre_paine11(); -void ogre_paine12(); -void ogre_paine13(); -void ogre_paine14(); -void ogre_paine15(); -void ogre_die1(); -void ogre_die2(); -void ogre_die3(); -void ogre_die4(); -void ogre_die5(); -void ogre_die6(); -void ogre_die7(); -void ogre_die8(); -void ogre_die9(); -void ogre_die10(); -void ogre_die11(); -void ogre_die12(); -void ogre_die13(); -void ogre_die14(); -void ogre_bdie1(); -void ogre_bdie2(); -void ogre_bdie3(); -void ogre_bdie4(); -void ogre_bdie5(); -void ogre_bdie6(); -void ogre_bdie7(); -void ogre_bdie8(); -void ogre_bdie9(); -void ogre_bdie10(); +void ogre_stand1(void); +void ogre_stand2(void); +void ogre_stand3(void); +void ogre_stand4(void); +void ogre_stand5(void); +void ogre_stand6(void); +void ogre_stand7(void); +void ogre_stand8(void); +void ogre_stand9(void); +void ogre_walk1(void); +void ogre_walk2(void); +void ogre_walk3(void); +void ogre_walk4(void); +void ogre_walk5(void); +void ogre_walk6(void); +void ogre_walk7(void); +void ogre_walk8(void); +void ogre_walk9(void); +void ogre_walk10(void); +void ogre_walk11(void); +void ogre_walk12(void); +void ogre_walk13(void); +void ogre_walk14(void); +void ogre_walk15(void); +void ogre_walk16(void); +void ogre_run1(void); +void ogre_run2(void); +void ogre_run3(void); +void ogre_run4(void); +void ogre_run5(void); +void ogre_run6(void); +void ogre_run7(void); +void ogre_run8(void); +void ogre_swing1(void); +void ogre_swing2(void); +void ogre_swing3(void); +void ogre_swing4(void); +void ogre_swing5(void); +void ogre_swing6(void); +void ogre_swing7(void); +void ogre_swing8(void); +void ogre_swing9(void); +void ogre_swing10(void); +void ogre_swing11(void); +void ogre_swing12(void); +void ogre_swing13(void); +void ogre_swing14(void); +void ogre_smash1(void); +void ogre_smash2(void); +void ogre_smash3(void); +void ogre_smash4(void); +void ogre_smash5(void); +void ogre_smash6(void); +void ogre_smash7(void); +void ogre_smash8(void); +void ogre_smash9(void); +void ogre_smash10(void); +void ogre_smash11(void); +void ogre_smash12(void); +void ogre_smash13(void); +void ogre_smash14(void); +void ogre_nail1(void); +void ogre_nail2(void); +void ogre_nail3(void); +void ogre_nail4(void); +void ogre_nail5(void); +void ogre_nail6(void); +void ogre_nail7(void); +void ogre_pain1(void); +void ogre_pain2(void); +void ogre_pain3(void); +void ogre_pain4(void); +void ogre_pain5(void); +void ogre_painb1(void); +void ogre_painb2(void); +void ogre_painb3(void); +void ogre_painc1(void); +void ogre_painc2(void); +void ogre_painc3(void); +void ogre_painc4(void); +void ogre_painc5(void); +void ogre_painc6(void); +void ogre_paind1(void); +void ogre_paind2(void); +void ogre_paind3(void); +void ogre_paind4(void); +void ogre_paind5(void); +void ogre_paind6(void); +void ogre_paind7(void); +void ogre_paind8(void); +void ogre_paind9(void); +void ogre_paind10(void); +void ogre_paind11(void); +void ogre_paind12(void); +void ogre_paind13(void); +void ogre_paind14(void); +void ogre_paind15(void); +void ogre_paind16(void); +void ogre_paine1(void); +void ogre_paine2(void); +void ogre_paine3(void); +void ogre_paine4(void); +void ogre_paine5(void); +void ogre_paine6(void); +void ogre_paine7(void); +void ogre_paine8(void); +void ogre_paine9(void); +void ogre_paine10(void); +void ogre_paine11(void); +void ogre_paine12(void); +void ogre_paine13(void); +void ogre_paine14(void); +void ogre_paine15(void); +void ogre_die1(void); +void ogre_die2(void); +void ogre_die3(void); +void ogre_die4(void); +void ogre_die5(void); +void ogre_die6(void); +void ogre_die7(void); +void ogre_die8(void); +void ogre_die9(void); +void ogre_die10(void); +void ogre_die11(void); +void ogre_die12(void); +void ogre_die13(void); +void ogre_die14(void); +void ogre_bdie1(void); +void ogre_bdie2(void); +void ogre_bdie3(void); +void ogre_bdie4(void); +void ogre_bdie5(void); +void ogre_bdie6(void); +void ogre_bdie7(void); +void ogre_bdie8(void); +void ogre_bdie9(void); +void ogre_bdie10(void); //============================================================================= @@ -499,7 +499,7 @@ ANIM(ogre_smash12, smash12, ogre_smash13; ai_charge(0);) ANIM(ogre_smash13, smash13, ogre_smash14; ai_charge(4);) ANIM(ogre_smash14, smash14, ogre_run1; ai_charge(12);) -void ogre_melee() +void ogre_melee(void) { if (g_random() > 0.5) { @@ -513,7 +513,7 @@ void ogre_melee() //============================================================================= -void OgreGrenadeExplode() +void OgreGrenadeExplode(void) { T_RadiusDamage(self, PROG_TO_EDICT(self->s.v.owner), 40, world, dtSQUISH); sound(self, CHAN_VOICE, "weapons/r_exp3.wav", 1, ATTN_NORM); @@ -528,7 +528,7 @@ void OgreGrenadeExplode() ent_remove(self); } -void OgreGrenadeTouch() +void OgreGrenadeTouch(void) { if (other == PROG_TO_EDICT(self->s.v.owner)) { @@ -555,7 +555,7 @@ void OgreGrenadeTouch() OgreFireGrenade ================ */ -void OgreFireGrenade() +void OgreFireGrenade(void) { gedict_t *missile; @@ -733,7 +733,7 @@ ANIM(ogre_bdie8, bdeath8, ogre_bdie9;) ANIM(ogre_bdie9, bdeath9, ogre_bdie10;) ANIM(ogre_bdie10, bdeath10, ogre_bdie10;) -void ogre_die() +void ogre_die(void) { // check for gib if (self->s.v.health < -80) @@ -773,7 +773,7 @@ void ogre_die() Returns false if movement should continue ============ */ -float OgreCheckAttack() +float OgreCheckAttack(void) { vec3_t spot1, spot2; gedict_t *targ; @@ -833,7 +833,7 @@ float OgreCheckAttack() /*QUAKED monster_ogre (1 0 0) (-32 -32 -24) (32 32 64) Ambush */ -void SP_monster_ogre() +void SP_monster_ogre(void) { if (!AllowMonster(self)) { diff --git a/src/sp_oldone.c b/src/sp_oldone.c index 31145621..4e72487f 100644 --- a/src/sp_oldone.c +++ b/src/sp_oldone.c @@ -98,72 +98,72 @@ enum }; -void old_idle1(); -void old_idle2(); -void old_idle3(); -void old_idle4(); -void old_idle5(); -void old_idle6(); -void old_idle7(); -void old_idle8(); -void old_idle9(); -void old_idle10(); -void old_idle11(); -void old_idle12(); -void old_idle13(); -void old_idle14(); -void old_idle15(); -void old_idle16(); -void old_idle17(); -void old_idle18(); -void old_idle19(); -void old_idle20(); -void old_idle21(); -void old_idle22(); -void old_idle23(); -void old_idle24(); -void old_idle25(); -void old_idle26(); -void old_idle27(); -void old_idle28(); -void old_idle29(); -void old_idle30(); -void old_idle31(); -void old_idle32(); -void old_idle33(); -void old_idle34(); -void old_idle35(); -void old_idle36(); -void old_idle37(); -void old_idle38(); -void old_idle39(); -void old_idle40(); -void old_idle41(); -void old_idle42(); -void old_idle43(); -void old_idle44(); -void old_idle45(); -void old_idle46(); -void old_thrash1(); -void old_thrash2(); -void old_thrash3(); -void old_thrash4(); -void old_thrash5(); -void old_thrash6(); -void old_thrash7(); -void old_thrash8(); -void old_thrash9(); -void old_thrash10(); -void old_thrash11(); -void old_thrash12(); -void old_thrash13(); -void old_thrash14(); -void old_thrash15(); -void old_thrash16(); -void old_thrash17(); -void old_thrash18(); -void old_thrash19(); -void old_thrash20(); +void old_idle1(void); +void old_idle2(void); +void old_idle3(void); +void old_idle4(void); +void old_idle5(void); +void old_idle6(void); +void old_idle7(void); +void old_idle8(void); +void old_idle9(void); +void old_idle10(void); +void old_idle11(void); +void old_idle12(void); +void old_idle13(void); +void old_idle14(void); +void old_idle15(void); +void old_idle16(void); +void old_idle17(void); +void old_idle18(void); +void old_idle19(void); +void old_idle20(void); +void old_idle21(void); +void old_idle22(void); +void old_idle23(void); +void old_idle24(void); +void old_idle25(void); +void old_idle26(void); +void old_idle27(void); +void old_idle28(void); +void old_idle29(void); +void old_idle30(void); +void old_idle31(void); +void old_idle32(void); +void old_idle33(void); +void old_idle34(void); +void old_idle35(void); +void old_idle36(void); +void old_idle37(void); +void old_idle38(void); +void old_idle39(void); +void old_idle40(void); +void old_idle41(void); +void old_idle42(void); +void old_idle43(void); +void old_idle44(void); +void old_idle45(void); +void old_idle46(void); +void old_thrash1(void); +void old_thrash2(void); +void old_thrash3(void); +void old_thrash4(void); +void old_thrash5(void); +void old_thrash6(void); +void old_thrash7(void); +void old_thrash8(void); +void old_thrash9(void); +void old_thrash10(void); +void old_thrash11(void); +void old_thrash12(void); +void old_thrash13(void); +void old_thrash14(void); +void old_thrash15(void); +void old_thrash16(void); +void old_thrash17(void); +void old_thrash18(void); +void old_thrash19(void); +void old_thrash20(void); //============================================================================= @@ -214,10 +214,10 @@ ANIM(old_idle44, old44, old_idle45;) ANIM(old_idle45, old45, old_idle46;) ANIM(old_idle46, old46, old_idle1;) -void finale_1(); -void finale_2(); -void finale_3(); -void finale_4(); +void finale_1(void); +void finale_2(void); +void finale_3(void); +void finale_4(void); void _old_thrash15(void) { @@ -252,7 +252,7 @@ ANIM(old_thrash20, shake20, old_thrash20; finale_4();) //============================================================================ -void finale_1() +void finale_1(void) { gedict_t *pl; gedict_t *timer; @@ -334,7 +334,7 @@ gedict_t* shub_find(char *msg) return shub; } -void finale_2() +void finale_2(void) { vec3_t o; gedict_t *shub = shub_find("finale_2"); @@ -356,7 +356,7 @@ void finale_2() self->think = (func_t) finale_3; } -void finale_3() +void finale_3(void) { gedict_t *shub = shub_find("finale_3"); @@ -370,7 +370,7 @@ void finale_3() ent_remove(self); } -void kill_all_monsters() +void kill_all_monsters(void) { gedict_t *monster; @@ -394,7 +394,7 @@ void kill_all_monsters() self->s.v.nextthink = g_globalvars.time + 0.2; } -void finale_4() +void finale_4(void) { // throw tons of meat chunks vec3_t oldo; @@ -486,7 +486,7 @@ void nopain(gedict_t *attacker, float damage) /*QUAKED monster_oldone (1 0 0) (-16 -16 -24) (16 16 32) */ -void SP_monster_oldone() +void SP_monster_oldone(void) { if (!AllowMonster(self)) { diff --git a/src/sp_shalrath.c b/src/sp_shalrath.c index acf6f917..8cca2805 100644 --- a/src/sp_shalrath.c +++ b/src/sp_shalrath.c @@ -69,54 +69,54 @@ enum }; -void shal_stand(); -void shal_walk1(); -void shal_walk2(); -void shal_walk3(); -void shal_walk4(); -void shal_walk5(); -void shal_walk6(); -void shal_walk7(); -void shal_walk8(); -void shal_walk9(); -void shal_walk10(); -void shal_walk11(); -void shal_walk12(); -void shal_run1(); -void shal_run2(); -void shal_run3(); -void shal_run4(); -void shal_run5(); -void shal_run6(); -void shal_run7(); -void shal_run8(); -void shal_run9(); -void shal_run10(); -void shal_run11(); -void shal_run12(); -void shal_attack1(); -void shal_attack2(); -void shal_attack3(); -void shal_attack4(); -void shal_attack5(); -void shal_attack6(); -void shal_attack7(); -void shal_attack8(); -void shal_attack9(); -void shal_attack10(); -void shal_attack11(); -void shal_pain1(); -void shal_pain2(); -void shal_pain3(); -void shal_pain4(); -void shal_pain5(); -void shal_death1(); -void shal_death2(); -void shal_death3(); -void shal_death4(); -void shal_death5(); -void shal_death6(); -void shal_death7(); +void shal_stand(void); +void shal_walk1(void); +void shal_walk2(void); +void shal_walk3(void); +void shal_walk4(void); +void shal_walk5(void); +void shal_walk6(void); +void shal_walk7(void); +void shal_walk8(void); +void shal_walk9(void); +void shal_walk10(void); +void shal_walk11(void); +void shal_walk12(void); +void shal_run1(void); +void shal_run2(void); +void shal_run3(void); +void shal_run4(void); +void shal_run5(void); +void shal_run6(void); +void shal_run7(void); +void shal_run8(void); +void shal_run9(void); +void shal_run10(void); +void shal_run11(void); +void shal_run12(void); +void shal_attack1(void); +void shal_attack2(void); +void shal_attack3(void); +void shal_attack4(void); +void shal_attack5(void); +void shal_attack6(void); +void shal_attack7(void); +void shal_attack8(void); +void shal_attack9(void); +void shal_attack10(void); +void shal_attack11(void); +void shal_pain1(void); +void shal_pain2(void); +void shal_pain3(void); +void shal_pain4(void); +void shal_pain5(void); +void shal_death1(void); +void shal_death2(void); +void shal_death3(void); +void shal_death4(void); +void shal_death5(void); +void shal_death6(void); +void shal_death7(void); //============================================================================= @@ -170,7 +170,7 @@ ANIM(shal_run12, walk1, shal_run1; ai_run(5);) //============================================================================= -void ShalMissileTouch() +void ShalMissileTouch(void) { if (other == PROG_TO_EDICT(self->s.v.owner)) { @@ -196,7 +196,7 @@ void ShalMissileTouch() ent_remove(self); } -void ShalHome() +void ShalHome(void) { vec3_t dir, vtemp; @@ -226,7 +226,7 @@ void ShalHome() ShalMissile ================ */ -void ShalMissile() +void ShalMissile(void) { gedict_t *missile; vec3_t dir; @@ -306,7 +306,7 @@ ANIM(shal_death5, death5, shal_death6;) ANIM(shal_death6, death6, shal_death7;) ANIM(shal_death7, death7, shal_death7;) -void shalrath_die() +void shalrath_die(void) { // check for gib if (self->s.v.health < -90) @@ -331,7 +331,7 @@ void shalrath_die() /*QUAKED monster_shalrath (1 0 0) (-32 -32 -24) (32 32 48) Ambush */ -void SP_monster_shalrath() +void SP_monster_shalrath(void) { if (!AllowMonster(self)) { diff --git a/src/sp_shambler.c b/src/sp_shambler.c index 505fa738..92618e2c 100644 --- a/src/sp_shambler.c +++ b/src/sp_shambler.c @@ -133,98 +133,98 @@ enum }; -void sham_stand1(); -void sham_stand2(); -void sham_stand3(); -void sham_stand4(); -void sham_stand5(); -void sham_stand6(); -void sham_stand7(); -void sham_stand8(); -void sham_stand9(); -void sham_stand10(); -void sham_stand11(); -void sham_stand12(); -void sham_stand13(); -void sham_stand14(); -void sham_stand15(); -void sham_stand16(); -void sham_stand17(); -void sham_walk1(); -void sham_walk2(); -void sham_walk3(); -void sham_walk4(); -void sham_walk5(); -void sham_walk6(); -void sham_walk7(); -void sham_walk8(); -void sham_walk9(); -void sham_walk10(); -void sham_walk11(); -void sham_walk12(); -void sham_run1(); -void sham_run2(); -void sham_run3(); -void sham_run4(); -void sham_run5(); -void sham_run6(); -void sham_smash1(); -void sham_smash2(); -void sham_smash3(); -void sham_smash4(); -void sham_smash5(); -void sham_smash6(); -void sham_smash7(); -void sham_smash8(); -void sham_smash9(); -void sham_smash10(); -void sham_smash11(); -void sham_smash12(); -void sham_swingl1(); -void sham_swingl2(); -void sham_swingl3(); -void sham_swingl4(); -void sham_swingl5(); -void sham_swingl6(); -void sham_swingl7(); -void sham_swingl8(); -void sham_swingl9(); -void sham_swingr1(); -void sham_swingr2(); -void sham_swingr3(); -void sham_swingr4(); -void sham_swingr5(); -void sham_swingr6(); -void sham_swingr7(); -void sham_swingr8(); -void sham_swingr9(); -void sham_magic1(); -void sham_magic2(); -void sham_magic3(); -void sham_magic4(); -void sham_magic5(); -void sham_magic6(); -void sham_magic9(); -void sham_magic10(); -void sham_magic11(); -void sham_magic12(); -void sham_pain1(); -void sham_pain2(); -void sham_pain3(); -void sham_pain4(); -void sham_pain5(); -void sham_pain6(); -void sham_death1(); -void sham_death2(); -void sham_death3(); -void sham_death4(); -void sham_death5(); -void sham_death6(); -void sham_death7(); -void sham_death8(); -void sham_death9(); -void sham_death10(); -void sham_death11(); +void sham_stand1(void); +void sham_stand2(void); +void sham_stand3(void); +void sham_stand4(void); +void sham_stand5(void); +void sham_stand6(void); +void sham_stand7(void); +void sham_stand8(void); +void sham_stand9(void); +void sham_stand10(void); +void sham_stand11(void); +void sham_stand12(void); +void sham_stand13(void); +void sham_stand14(void); +void sham_stand15(void); +void sham_stand16(void); +void sham_stand17(void); +void sham_walk1(void); +void sham_walk2(void); +void sham_walk3(void); +void sham_walk4(void); +void sham_walk5(void); +void sham_walk6(void); +void sham_walk7(void); +void sham_walk8(void); +void sham_walk9(void); +void sham_walk10(void); +void sham_walk11(void); +void sham_walk12(void); +void sham_run1(void); +void sham_run2(void); +void sham_run3(void); +void sham_run4(void); +void sham_run5(void); +void sham_run6(void); +void sham_smash1(void); +void sham_smash2(void); +void sham_smash3(void); +void sham_smash4(void); +void sham_smash5(void); +void sham_smash6(void); +void sham_smash7(void); +void sham_smash8(void); +void sham_smash9(void); +void sham_smash10(void); +void sham_smash11(void); +void sham_smash12(void); +void sham_swingl1(void); +void sham_swingl2(void); +void sham_swingl3(void); +void sham_swingl4(void); +void sham_swingl5(void); +void sham_swingl6(void); +void sham_swingl7(void); +void sham_swingl8(void); +void sham_swingl9(void); +void sham_swingr1(void); +void sham_swingr2(void); +void sham_swingr3(void); +void sham_swingr4(void); +void sham_swingr5(void); +void sham_swingr6(void); +void sham_swingr7(void); +void sham_swingr8(void); +void sham_swingr9(void); +void sham_magic1(void); +void sham_magic2(void); +void sham_magic3(void); +void sham_magic4(void); +void sham_magic5(void); +void sham_magic6(void); +void sham_magic9(void); +void sham_magic10(void); +void sham_magic11(void); +void sham_magic12(void); +void sham_pain1(void); +void sham_pain2(void); +void sham_pain3(void); +void sham_pain4(void); +void sham_pain5(void); +void sham_pain6(void); +void sham_death1(void); +void sham_death2(void); +void sham_death3(void); +void sham_death4(void); +void sham_death5(void); +void sham_death6(void); +void sham_death7(void); +void sham_death8(void); +void sham_death9(void); +void sham_death10(void); +void sham_death11(void); //============================================================================= @@ -432,7 +432,7 @@ ANIM(sham_swingr7, swingr7, sham_swingr8; ai_charge(6); ShamClaw(-250);) ANIM(sham_swingr8, swingr8, sham_swingr9; ai_charge(3);) ANIM(sham_swingr9, swingr9, sham_run1; _sham_swingr9();) -void sham_melee() +void sham_melee(void) { float chance; @@ -454,7 +454,7 @@ void sham_melee() //============================================================================ -void CastLightning() +void CastLightning(void) { vec3_t org, dir; @@ -490,7 +490,7 @@ void CastLightning() } // shambler's bolt have 3 frames, I guess -void sham_bolt() +void sham_bolt(void) { if ((self->s.v.frame == 2) || ((self->spawn_time + 0.7) < g_globalvars.time)) { @@ -586,7 +586,7 @@ ANIM(sham_death9, death9, sham_death10;) ANIM(sham_death10, death10, sham_death11;) ANIM(sham_death11, death11, sham_death11;) -void sham_die() +void sham_die(void) { // check for gib if (self->s.v.health < -60) @@ -618,7 +618,7 @@ void sham_die() Returns false if movement should continue ============ */ -float ShamCheckAttack() +float ShamCheckAttack(void) { vec3_t spot1, spot2, delta; gedict_t *targ; @@ -684,7 +684,7 @@ float ShamCheckAttack() /*QUAKED monster_shambler (1 0 0) (-32 -32 -24) (32 32 64) Ambush */ -void SP_monster_shambler() +void SP_monster_shambler(void) { if (!AllowMonster(self)) { diff --git a/src/sp_soldier.c b/src/sp_soldier.c index e7cf325a..cfc500de 100644 --- a/src/sp_soldier.c +++ b/src/sp_soldier.c @@ -154,109 +154,109 @@ enum }; -void army_stand1(); -void army_stand2(); -void army_stand3(); -void army_stand4(); -void army_stand5(); -void army_stand6(); -void army_stand7(); -void army_stand8(); -void army_walk1(); -void army_walk2(); -void army_walk3(); -void army_walk4(); -void army_walk5(); -void army_walk6(); -void army_walk7(); -void army_walk8(); -void army_walk9(); -void army_walk10(); -void army_walk11(); -void army_walk12(); -void army_walk13(); -void army_walk14(); -void army_walk15(); -void army_walk16(); -void army_walk17(); -void army_walk18(); -void army_walk19(); -void army_walk20(); -void army_walk21(); -void army_walk22(); -void army_walk23(); -void army_walk24(); -void army_run1(); -void army_run2(); -void army_run3(); -void army_run4(); -void army_run5(); -void army_run6(); -void army_run7(); -void army_run8(); -void army_atk1(); -void army_atk2(); -void army_atk3(); -void army_atk4(); -void army_atk5(); -void army_atk6(); -void army_atk7(); -void army_atk8(); -void army_atk9(); -void army_pain1(); -void army_pain2(); -void army_pain3(); -void army_pain4(); -void army_pain5(); -void army_pain6(); -void army_painb1(); -void army_painb2(); -void army_painb3(); -void army_painb4(); -void army_painb5(); -void army_painb6(); -void army_painb7(); -void army_painb8(); -void army_painb9(); -void army_painb10(); -void army_painb11(); -void army_painb12(); -void army_painb13(); -void army_painb14(); -void army_painc1(); -void army_painc2(); -void army_painc3(); -void army_painc4(); -void army_painc5(); -void army_painc6(); -void army_painc7(); -void army_painc8(); -void army_painc9(); -void army_painc10(); -void army_painc11(); -void army_painc12(); -void army_painc13(); -void army_die1(); -void army_die2(); -void army_die3(); -void army_die4(); -void army_die5(); -void army_die6(); -void army_die7(); -void army_die8(); -void army_die9(); -void army_die10(); -void army_cdie1(); -void army_cdie2(); -void army_cdie3(); -void army_cdie4(); -void army_cdie5(); -void army_cdie6(); -void army_cdie7(); -void army_cdie8(); -void army_cdie9(); -void army_cdie10(); -void army_cdie11(); +void army_stand1(void); +void army_stand2(void); +void army_stand3(void); +void army_stand4(void); +void army_stand5(void); +void army_stand6(void); +void army_stand7(void); +void army_stand8(void); +void army_walk1(void); +void army_walk2(void); +void army_walk3(void); +void army_walk4(void); +void army_walk5(void); +void army_walk6(void); +void army_walk7(void); +void army_walk8(void); +void army_walk9(void); +void army_walk10(void); +void army_walk11(void); +void army_walk12(void); +void army_walk13(void); +void army_walk14(void); +void army_walk15(void); +void army_walk16(void); +void army_walk17(void); +void army_walk18(void); +void army_walk19(void); +void army_walk20(void); +void army_walk21(void); +void army_walk22(void); +void army_walk23(void); +void army_walk24(void); +void army_run1(void); +void army_run2(void); +void army_run3(void); +void army_run4(void); +void army_run5(void); +void army_run6(void); +void army_run7(void); +void army_run8(void); +void army_atk1(void); +void army_atk2(void); +void army_atk3(void); +void army_atk4(void); +void army_atk5(void); +void army_atk6(void); +void army_atk7(void); +void army_atk8(void); +void army_atk9(void); +void army_pain1(void); +void army_pain2(void); +void army_pain3(void); +void army_pain4(void); +void army_pain5(void); +void army_pain6(void); +void army_painb1(void); +void army_painb2(void); +void army_painb3(void); +void army_painb4(void); +void army_painb5(void); +void army_painb6(void); +void army_painb7(void); +void army_painb8(void); +void army_painb9(void); +void army_painb10(void); +void army_painb11(void); +void army_painb12(void); +void army_painb13(void); +void army_painb14(void); +void army_painc1(void); +void army_painc2(void); +void army_painc3(void); +void army_painc4(void); +void army_painc5(void); +void army_painc6(void); +void army_painc7(void); +void army_painc8(void); +void army_painc9(void); +void army_painc10(void); +void army_painc11(void); +void army_painc12(void); +void army_painc13(void); +void army_die1(void); +void army_die2(void); +void army_die3(void); +void army_die4(void); +void army_die5(void); +void army_die6(void); +void army_die7(void); +void army_die8(void); +void army_die9(void); +void army_die10(void); +void army_cdie1(void); +void army_cdie2(void); +void army_cdie3(void); +void army_cdie4(void); +void army_cdie5(void); +void army_cdie6(void); +void army_cdie7(void); +void army_cdie8(void); +void army_cdie9(void); +void army_cdie10(void); +void army_cdie11(void); //============================================================================== @@ -323,7 +323,7 @@ ANIM(army_run6, run6, army_run7; ai_run(15);) ANIM(army_run7, run7, army_run8; ai_run(10);) ANIM(army_run8, run8, army_run1; ai_run(8);) -void army_fire() +void army_fire(void) { vec3_t dir; gedict_t *en; @@ -457,7 +457,7 @@ ANIM(army_cdie9, deathc9, army_cdie10;) ANIM(army_cdie10, deathc10, army_cdie11;) ANIM(army_cdie11, deathc11, army_cdie11;) -void army_die() +void army_die(void) { // check for gib if (self->s.v.health < -35) @@ -498,7 +498,7 @@ void army_die() Returns false if movement should continue ============ */ -float SoldierCheckAttack() +float SoldierCheckAttack(void) { vec3_t spot1, spot2; gedict_t *targ; @@ -574,7 +574,7 @@ float SoldierCheckAttack() /*QUAKED monster_army (1 0 0) (-16 -16 -24) (16 16 40) Ambush */ -void SP_monster_army() +void SP_monster_army(void) { if (!AllowMonster(self)) { diff --git a/src/sp_tarbaby.c b/src/sp_tarbaby.c index 1ae4335f..de7d6547 100644 --- a/src/sp_tarbaby.c +++ b/src/sp_tarbaby.c @@ -96,73 +96,73 @@ enum }; -void tbaby_stand1(); -void tbaby_stand2(); -void tbaby_stand3(); -void tbaby_stand4(); - -void tbaby_walk1(); -void tbaby_walk2(); -void tbaby_walk3(); -void tbaby_walk4(); -void tbaby_walk5(); -void tbaby_walk6(); -void tbaby_walk7(); -void tbaby_walk8(); -void tbaby_walk9(); -void tbaby_walk10(); -void tbaby_walk11(); -void tbaby_walk12(); -void tbaby_walk13(); -void tbaby_walk14(); -void tbaby_walk15(); -void tbaby_walk16(); -void tbaby_walk17(); -void tbaby_walk18(); -void tbaby_walk19(); -void tbaby_walk20(); -void tbaby_walk21(); -void tbaby_walk22(); -void tbaby_walk23(); -void tbaby_walk24(); -void tbaby_walk25(); -void tbaby_run1(); -void tbaby_run2(); -void tbaby_run3(); -void tbaby_run4(); -void tbaby_run5(); -void tbaby_run6(); -void tbaby_run7(); -void tbaby_run8(); -void tbaby_run9(); -void tbaby_run10(); -void tbaby_run11(); -void tbaby_run12(); -void tbaby_run13(); -void tbaby_run14(); -void tbaby_run15(); -void tbaby_run16(); -void tbaby_run17(); -void tbaby_run18(); -void tbaby_run19(); -void tbaby_run20(); -void tbaby_run21(); -void tbaby_run22(); -void tbaby_run23(); -void tbaby_run24(); -void tbaby_run25(); -void tbaby_fly1(); -void tbaby_fly2(); -void tbaby_fly3(); -void tbaby_fly4(); -void tbaby_jump1(); -void tbaby_jump2(); -void tbaby_jump3(); -void tbaby_jump4(); -void tbaby_jump5(); -void tbaby_jump6(); -void tbaby_die1(); -void tbaby_die2(); +void tbaby_stand1(void); +void tbaby_stand2(void); +void tbaby_stand3(void); +void tbaby_stand4(void); + +void tbaby_walk1(void); +void tbaby_walk2(void); +void tbaby_walk3(void); +void tbaby_walk4(void); +void tbaby_walk5(void); +void tbaby_walk6(void); +void tbaby_walk7(void); +void tbaby_walk8(void); +void tbaby_walk9(void); +void tbaby_walk10(void); +void tbaby_walk11(void); +void tbaby_walk12(void); +void tbaby_walk13(void); +void tbaby_walk14(void); +void tbaby_walk15(void); +void tbaby_walk16(void); +void tbaby_walk17(void); +void tbaby_walk18(void); +void tbaby_walk19(void); +void tbaby_walk20(void); +void tbaby_walk21(void); +void tbaby_walk22(void); +void tbaby_walk23(void); +void tbaby_walk24(void); +void tbaby_walk25(void); +void tbaby_run1(void); +void tbaby_run2(void); +void tbaby_run3(void); +void tbaby_run4(void); +void tbaby_run5(void); +void tbaby_run6(void); +void tbaby_run7(void); +void tbaby_run8(void); +void tbaby_run9(void); +void tbaby_run10(void); +void tbaby_run11(void); +void tbaby_run12(void); +void tbaby_run13(void); +void tbaby_run14(void); +void tbaby_run15(void); +void tbaby_run16(void); +void tbaby_run17(void); +void tbaby_run18(void); +void tbaby_run19(void); +void tbaby_run20(void); +void tbaby_run21(void); +void tbaby_run22(void); +void tbaby_run23(void); +void tbaby_run24(void); +void tbaby_run25(void); +void tbaby_fly1(void); +void tbaby_fly2(void); +void tbaby_fly3(void); +void tbaby_fly4(void); +void tbaby_jump1(void); +void tbaby_jump2(void); +void tbaby_jump3(void); +void tbaby_jump4(void); +void tbaby_jump5(void); +void tbaby_jump6(void); +void tbaby_die1(void); +void tbaby_die2(void); //============================================================================ @@ -227,7 +227,7 @@ ANIM(tbaby_run25, run25, tbaby_run1; ai_run(2);) //============================================================================ -void Tar_JumpTouch() +void Tar_JumpTouch(void) { float ldmg; @@ -338,7 +338,7 @@ ANIM(tbaby_die2, exp1, tbaby_die2; _tbaby_die2();) /*QUAKED monster_tarbaby (1 0 0) (-16 -16 -24) (16 16 24) Ambush */ -void SP_monster_tarbaby() +void SP_monster_tarbaby(void) { if (!AllowMonster(self)) { diff --git a/src/sp_wizard.c b/src/sp_wizard.c index d91ef1e4..7a78a33e 100644 --- a/src/sp_wizard.c +++ b/src/sp_wizard.c @@ -89,66 +89,66 @@ enum }; -void wiz_stand1(); -void wiz_stand2(); -void wiz_stand3(); -void wiz_stand4(); -void wiz_stand5(); -void wiz_stand6(); -void wiz_stand7(); -void wiz_stand8(); -void wiz_walk1(); -void wiz_walk2(); -void wiz_walk3(); -void wiz_walk4(); -void wiz_walk5(); -void wiz_walk6(); -void wiz_walk7(); -void wiz_walk8(); -void wiz_side1(); -void wiz_side2(); -void wiz_side3(); -void wiz_side4(); -void wiz_side5(); -void wiz_side6(); -void wiz_side7(); -void wiz_side8(); -void wiz_run1(); -void wiz_run2(); -void wiz_run3(); -void wiz_run4(); -void wiz_run5(); -void wiz_run6(); -void wiz_run7(); -void wiz_run8(); -void wiz_run9(); -void wiz_run10(); -void wiz_run11(); -void wiz_run12(); -void wiz_run13(); -void wiz_run14(); -void wiz_fast1(); -void wiz_fast2(); -void wiz_fast3(); -void wiz_fast4(); -void wiz_fast5(); -void wiz_fast6(); -void wiz_fast7(); -void wiz_fast8(); -void wiz_fast9(); -void wiz_fast10(); -void wiz_pain1(); -void wiz_pain2(); -void wiz_pain3(); -void wiz_pain4(); -void wiz_death1(); -void wiz_death2(); -void wiz_death3(); -void wiz_death4(); -void wiz_death5(); -void wiz_death6(); -void wiz_death7(); -void wiz_death8(); +void wiz_stand1(void); +void wiz_stand2(void); +void wiz_stand3(void); +void wiz_stand4(void); +void wiz_stand5(void); +void wiz_stand6(void); +void wiz_stand7(void); +void wiz_stand8(void); +void wiz_walk1(void); +void wiz_walk2(void); +void wiz_walk3(void); +void wiz_walk4(void); +void wiz_walk5(void); +void wiz_walk6(void); +void wiz_walk7(void); +void wiz_walk8(void); +void wiz_side1(void); +void wiz_side2(void); +void wiz_side3(void); +void wiz_side4(void); +void wiz_side5(void); +void wiz_side6(void); +void wiz_side7(void); +void wiz_side8(void); +void wiz_run1(void); +void wiz_run2(void); +void wiz_run3(void); +void wiz_run4(void); +void wiz_run5(void); +void wiz_run6(void); +void wiz_run7(void); +void wiz_run8(void); +void wiz_run9(void); +void wiz_run10(void); +void wiz_run11(void); +void wiz_run12(void); +void wiz_run13(void); +void wiz_run14(void); +void wiz_fast1(void); +void wiz_fast2(void); +void wiz_fast3(void); +void wiz_fast4(void); +void wiz_fast5(void); +void wiz_fast6(void); +void wiz_fast7(void); +void wiz_fast8(void); +void wiz_fast9(void); +void wiz_fast10(void); +void wiz_pain1(void); +void wiz_pain2(void); +void wiz_pain3(void); +void wiz_pain4(void); +void wiz_death1(void); +void wiz_death2(void); +void wiz_death3(void); +void wiz_death4(void); +void wiz_death5(void); +void wiz_death6(void); +void wiz_death7(void); +void wiz_death8(void); /* ============================================================================== @@ -158,7 +158,7 @@ void wiz_death8(); ============================================================================== */ -void Wiz_IdleSound() +void Wiz_IdleSound(void) { float wr = g_random() * 5; @@ -218,7 +218,7 @@ ANIM(wiz_run12, fly12, wiz_run13; ai_run(16);) ANIM(wiz_run13, fly13, wiz_run14; ai_run(16);) ANIM(wiz_run14, fly14, wiz_run1; ai_run(16);) -void Wiz_FastFire() +void Wiz_FastFire(void) { vec3_t vec; vec3_t dst; @@ -256,7 +256,7 @@ void Wiz_FastFire() ent_remove(self); } -void Wiz_StartFast() +void Wiz_StartFast(void) { gedict_t *missile; @@ -294,7 +294,7 @@ void Wiz_StartFast() VectorScale(g_globalvars.v_right, -1, missile->s.v.movedir); } -void WizardAttackFinished() +void WizardAttackFinished(void) { if ((enemy_range >= RANGE_MID) || !enemy_vis) { @@ -355,7 +355,7 @@ ANIM(wiz_death6, death6, wiz_death7;) ANIM(wiz_death7, death7, wiz_death8;) ANIM(wiz_death8, death8, wiz_death8;) -void wiz_die() +void wiz_die(void) { // check for gib if (self->s.v.health < -40) @@ -381,7 +381,7 @@ void wiz_die() WizardCheckAttack ================= */ -float WizardCheckAttack() +float WizardCheckAttack(void) { vec3_t spot1, spot2; gedict_t *targ; @@ -478,7 +478,7 @@ float WizardCheckAttack() /*QUAKED monster_wizard (1 0 0) (-16 -16 -24) (16 16 40) Ambush */ -void SP_monster_wizard() +void SP_monster_wizard(void) { if (!AllowMonster(self)) { diff --git a/src/sp_zombie.c b/src/sp_zombie.c index a238135f..2dff9ed0 100644 --- a/src/sp_zombie.c +++ b/src/sp_zombie.c @@ -251,204 +251,204 @@ qbool frame_is_long_zombie_pain(int frame) return ((frame >= paine1) && (frame <= paine30)); } -void zombie_stand1(); -void zombie_stand2(); -void zombie_stand3(); -void zombie_stand4(); -void zombie_stand5(); -void zombie_stand6(); -void zombie_stand7(); -void zombie_stand8(); -void zombie_stand9(); -void zombie_stand10(); -void zombie_stand11(); -void zombie_stand12(); -void zombie_stand13(); -void zombie_stand14(); -void zombie_stand15(); -void zombie_cruc1(); -void zombie_cruc2(); -void zombie_cruc3(); -void zombie_cruc4(); -void zombie_cruc5(); -void zombie_cruc6(); -void zombie_walk1(); -void zombie_walk2(); -void zombie_walk3(); -void zombie_walk4(); -void zombie_walk5(); -void zombie_walk6(); -void zombie_walk7(); -void zombie_walk8(); -void zombie_walk9(); -void zombie_walk10(); -void zombie_walk11(); -void zombie_walk12(); -void zombie_walk13(); -void zombie_walk14(); -void zombie_walk15(); -void zombie_walk16(); -void zombie_walk17(); -void zombie_walk18(); -void zombie_walk19(); -void zombie_run1(); -void zombie_run2(); -void zombie_run3(); -void zombie_run4(); -void zombie_run5(); -void zombie_run6(); -void zombie_run7(); -void zombie_run8(); -void zombie_run9(); -void zombie_run10(); -void zombie_run11(); -void zombie_run12(); -void zombie_run13(); -void zombie_run14(); -void zombie_run15(); -void zombie_run16(); -void zombie_run17(); -void zombie_run18(); -void zombie_atta1(); -void zombie_atta2(); -void zombie_atta3(); -void zombie_atta4(); -void zombie_atta5(); -void zombie_atta6(); -void zombie_atta7(); -void zombie_atta8(); -void zombie_atta9(); -void zombie_atta10(); -void zombie_atta11(); -void zombie_atta12(); -void zombie_atta13(); -void zombie_attb1(); -void zombie_attb2(); -void zombie_attb3(); -void zombie_attb4(); -void zombie_attb5(); -void zombie_attb6(); -void zombie_attb7(); -void zombie_attb8(); -void zombie_attb9(); -void zombie_attb10(); -void zombie_attb11(); -void zombie_attb12(); -void zombie_attb13(); -void zombie_attb14(); -void zombie_attc1(); -void zombie_attc2(); -void zombie_attc3(); -void zombie_attc4(); -void zombie_attc5(); -void zombie_attc6(); -void zombie_attc7(); -void zombie_attc8(); -void zombie_attc9(); -void zombie_attc10(); -void zombie_attc11(); -void zombie_attc12(); -void zombie_paina1(); -void zombie_paina2(); -void zombie_paina3(); -void zombie_paina4(); -void zombie_paina5(); -void zombie_paina6(); -void zombie_paina7(); -void zombie_paina8(); -void zombie_paina9(); -void zombie_paina10(); -void zombie_paina11(); -void zombie_paina12(); -void zombie_painb1(); -void zombie_painb2(); -void zombie_painb3(); -void zombie_painb4(); -void zombie_painb5(); -void zombie_painb6(); -void zombie_painb7(); -void zombie_painb8(); -void zombie_painb9(); -void zombie_painb10(); -void zombie_painb11(); -void zombie_painb12(); -void zombie_painb13(); -void zombie_painb14(); -void zombie_painb15(); -void zombie_painb16(); -void zombie_painb17(); -void zombie_painb18(); -void zombie_painb19(); -void zombie_painb20(); -void zombie_painb21(); -void zombie_painb22(); -void zombie_painb23(); -void zombie_painb24(); -void zombie_painb25(); -void zombie_painb26(); -void zombie_painb27(); -void zombie_painb28(); -void zombie_painc1(); -void zombie_painc2(); -void zombie_painc3(); -void zombie_painc4(); -void zombie_painc5(); -void zombie_painc6(); -void zombie_painc7(); -void zombie_painc8(); -void zombie_painc9(); -void zombie_painc10(); -void zombie_painc11(); -void zombie_painc12(); -void zombie_painc13(); -void zombie_painc14(); -void zombie_painc15(); -void zombie_painc16(); -void zombie_painc17(); -void zombie_painc18(); -void zombie_paind1(); -void zombie_paind2(); -void zombie_paind3(); -void zombie_paind4(); -void zombie_paind5(); -void zombie_paind6(); -void zombie_paind7(); -void zombie_paind8(); -void zombie_paind9(); -void zombie_paind10(); -void zombie_paind11(); -void zombie_paind12(); -void zombie_paind13(); -void zombie_paine1(); -void zombie_paine2(); -void zombie_paine3(); -void zombie_paine4(); -void zombie_paine5(); -void zombie_paine6(); -void zombie_paine7(); -void zombie_paine8(); -void zombie_paine9(); -void zombie_paine10(); -void zombie_paine11(); -void zombie_paine12(); -void zombie_paine13(); -void zombie_paine14(); -void zombie_paine15(); -void zombie_paine16(); -void zombie_paine17(); -void zombie_paine18(); -void zombie_paine19(); -void zombie_paine20(); -void zombie_paine21(); -void zombie_paine22(); -void zombie_paine23(); -void zombie_paine24(); -void zombie_paine25(); -void zombie_paine26(); -void zombie_paine27(); -void zombie_paine28(); -void zombie_paine29(); -void zombie_paine30(); +void zombie_stand1(void); +void zombie_stand2(void); +void zombie_stand3(void); +void zombie_stand4(void); +void zombie_stand5(void); +void zombie_stand6(void); +void zombie_stand7(void); +void zombie_stand8(void); +void zombie_stand9(void); +void zombie_stand10(void); +void zombie_stand11(void); +void zombie_stand12(void); +void zombie_stand13(void); +void zombie_stand14(void); +void zombie_stand15(void); +void zombie_cruc1(void); +void zombie_cruc2(void); +void zombie_cruc3(void); +void zombie_cruc4(void); +void zombie_cruc5(void); +void zombie_cruc6(void); +void zombie_walk1(void); +void zombie_walk2(void); +void zombie_walk3(void); +void zombie_walk4(void); +void zombie_walk5(void); +void zombie_walk6(void); +void zombie_walk7(void); +void zombie_walk8(void); +void zombie_walk9(void); +void zombie_walk10(void); +void zombie_walk11(void); +void zombie_walk12(void); +void zombie_walk13(void); +void zombie_walk14(void); +void zombie_walk15(void); +void zombie_walk16(void); +void zombie_walk17(void); +void zombie_walk18(void); +void zombie_walk19(void); +void zombie_run1(void); +void zombie_run2(void); +void zombie_run3(void); +void zombie_run4(void); +void zombie_run5(void); +void zombie_run6(void); +void zombie_run7(void); +void zombie_run8(void); +void zombie_run9(void); +void zombie_run10(void); +void zombie_run11(void); +void zombie_run12(void); +void zombie_run13(void); +void zombie_run14(void); +void zombie_run15(void); +void zombie_run16(void); +void zombie_run17(void); +void zombie_run18(void); +void zombie_atta1(void); +void zombie_atta2(void); +void zombie_atta3(void); +void zombie_atta4(void); +void zombie_atta5(void); +void zombie_atta6(void); +void zombie_atta7(void); +void zombie_atta8(void); +void zombie_atta9(void); +void zombie_atta10(void); +void zombie_atta11(void); +void zombie_atta12(void); +void zombie_atta13(void); +void zombie_attb1(void); +void zombie_attb2(void); +void zombie_attb3(void); +void zombie_attb4(void); +void zombie_attb5(void); +void zombie_attb6(void); +void zombie_attb7(void); +void zombie_attb8(void); +void zombie_attb9(void); +void zombie_attb10(void); +void zombie_attb11(void); +void zombie_attb12(void); +void zombie_attb13(void); +void zombie_attb14(void); +void zombie_attc1(void); +void zombie_attc2(void); +void zombie_attc3(void); +void zombie_attc4(void); +void zombie_attc5(void); +void zombie_attc6(void); +void zombie_attc7(void); +void zombie_attc8(void); +void zombie_attc9(void); +void zombie_attc10(void); +void zombie_attc11(void); +void zombie_attc12(void); +void zombie_paina1(void); +void zombie_paina2(void); +void zombie_paina3(void); +void zombie_paina4(void); +void zombie_paina5(void); +void zombie_paina6(void); +void zombie_paina7(void); +void zombie_paina8(void); +void zombie_paina9(void); +void zombie_paina10(void); +void zombie_paina11(void); +void zombie_paina12(void); +void zombie_painb1(void); +void zombie_painb2(void); +void zombie_painb3(void); +void zombie_painb4(void); +void zombie_painb5(void); +void zombie_painb6(void); +void zombie_painb7(void); +void zombie_painb8(void); +void zombie_painb9(void); +void zombie_painb10(void); +void zombie_painb11(void); +void zombie_painb12(void); +void zombie_painb13(void); +void zombie_painb14(void); +void zombie_painb15(void); +void zombie_painb16(void); +void zombie_painb17(void); +void zombie_painb18(void); +void zombie_painb19(void); +void zombie_painb20(void); +void zombie_painb21(void); +void zombie_painb22(void); +void zombie_painb23(void); +void zombie_painb24(void); +void zombie_painb25(void); +void zombie_painb26(void); +void zombie_painb27(void); +void zombie_painb28(void); +void zombie_painc1(void); +void zombie_painc2(void); +void zombie_painc3(void); +void zombie_painc4(void); +void zombie_painc5(void); +void zombie_painc6(void); +void zombie_painc7(void); +void zombie_painc8(void); +void zombie_painc9(void); +void zombie_painc10(void); +void zombie_painc11(void); +void zombie_painc12(void); +void zombie_painc13(void); +void zombie_painc14(void); +void zombie_painc15(void); +void zombie_painc16(void); +void zombie_painc17(void); +void zombie_painc18(void); +void zombie_paind1(void); +void zombie_paind2(void); +void zombie_paind3(void); +void zombie_paind4(void); +void zombie_paind5(void); +void zombie_paind6(void); +void zombie_paind7(void); +void zombie_paind8(void); +void zombie_paind9(void); +void zombie_paind10(void); +void zombie_paind11(void); +void zombie_paind12(void); +void zombie_paind13(void); +void zombie_paine1(void); +void zombie_paine2(void); +void zombie_paine3(void); +void zombie_paine4(void); +void zombie_paine5(void); +void zombie_paine6(void); +void zombie_paine7(void); +void zombie_paine8(void); +void zombie_paine9(void); +void zombie_paine10(void); +void zombie_paine11(void); +void zombie_paine12(void); +void zombie_paine13(void); +void zombie_paine14(void); +void zombie_paine15(void); +void zombie_paine16(void); +void zombie_paine17(void); +void zombie_paine18(void); +void zombie_paine19(void); +void zombie_paine20(void); +void zombie_paine21(void); +void zombie_paine22(void); +void zombie_paine23(void); +void zombie_paine24(void); +void zombie_paine25(void); +void zombie_paine26(void); +void zombie_paine27(void); +void zombie_paine28(void); +void zombie_paine29(void); +void zombie_paine30(void); const int SPAWN_CRUCIFIED = 1; @@ -561,7 +561,7 @@ ANIM(zombie_run18, run18, zombie_run1; _zombie_run18();) ============================================================================= */ -void ZombieGrenadeTouch() +void ZombieGrenadeTouch(void) { if (other == PROG_TO_EDICT(self->s.v.owner)) { @@ -671,7 +671,7 @@ ANIM(zombie_attc10, attc10, zombie_attc11; ai_face();) ANIM(zombie_attc11, attc11, zombie_attc12; ai_face();) ANIM(zombie_attc12, attc12, zombie_run1; ai_face(); ZombieFireGrenade( -10, 14, 20 );) -void zombie_missile() +void zombie_missile(void) { float r; @@ -917,7 +917,7 @@ void zombie_pain(gedict_t *attacker, float take) } } -void zombie_die() +void zombie_die(void) { sound(self, CHAN_VOICE, "zombie/z_gib.wav", 1, ATTN_NORM); ThrowHead("progs/h_zombie.mdl", self->s.v.health); @@ -934,7 +934,7 @@ void zombie_die() If crucified, stick the bounding box 12 pixels back into a wall to look right. */ -void SP_monster_zombie() +void SP_monster_zombie(void) { if (!AllowMonster(self)) { diff --git a/src/spectate.c b/src/spectate.c index 2cf1f69f..24c8b7aa 100644 --- a/src/spectate.c +++ b/src/spectate.c @@ -29,17 +29,17 @@ void Wp_Stats(float on); void Sc_Stats(float on); -void DoAutoTrack(); -void AdminImpBot(); +void DoAutoTrack(void); +void AdminImpBot(void); -void MakeMOTD(); -void AutoTrackRestore(); +void MakeMOTD(void); +void AutoTrackRestore(void); void Bot_Print_Thinking(void); qbool TrackChangeCoach(gedict_t *p); -int GetSpecWizard() +int GetSpecWizard(void) { int k_asw = bound(0, cvar("allow_spec_wizard"), 2); @@ -63,7 +63,7 @@ int GetSpecWizard() return 0; } -void ShowCamHelp() +void ShowCamHelp(void) { G_sprint(self, 2, "use %s %s to jump between spawn points\n" "use [attack] to change cam mode\n" @@ -71,7 +71,7 @@ void ShowCamHelp() redtext("impulse"), dig3(1)); } -void wizard_think() +void wizard_think(void) { if (!cvar("k_no_wizard_animation")) // animate if allowed { @@ -86,7 +86,7 @@ void wizard_think() self->s.v.nextthink = g_globalvars.time + 0.1; } -void SpecDecodeLevelParms() +void SpecDecodeLevelParms(void) { /* self->s.v.items = g_globalvars.parm1; @@ -156,7 +156,7 @@ qbool SpecCanConnect(gedict_t *spec) // self // params /////////////// -void SpectatorConnect() +void SpectatorConnect(void) { gedict_t *p; int diff = (int)(PROG_TO_EDICT(self->s.v.goalentity) - world); @@ -209,7 +209,7 @@ void SpectatorConnect() // self /////////////// extern int g_matchstarttime; -void PutSpectatorInServer() +void PutSpectatorInServer(void) { // G_sprint(self, 2, "Hellow %s\n", getname(self)); @@ -225,7 +225,7 @@ void PutSpectatorInServer() // GlobalParams: // self /////////////// -void SpectatorDisconnect() +void SpectatorDisconnect(void) { gedict_t *p; @@ -279,7 +279,7 @@ void SpectatorDisconnect() Called by SpectatorThink if the spectator entered an impulse ================ */ -void SpectatorImpulseCommand() +void SpectatorImpulseCommand(void) { gedict_t *goal; @@ -336,7 +336,7 @@ void SpectatorImpulseCommand() self->s.v.impulse = 0; } -void SpecGoalChanged() +void SpecGoalChanged(void) { if (self->k_coach) { @@ -364,7 +364,7 @@ void SpecGoalChanged() // time // self /////////////// -void SpectatorThink() +void SpectatorThink(void) { gedict_t *wizard = self->wizard; @@ -447,7 +447,7 @@ void SpectatorThink() } } -void remove_specs_wizards() +void remove_specs_wizards(void) { gedict_t *p; @@ -461,7 +461,7 @@ void remove_specs_wizards() } } -void hide_specs_wizards() +void hide_specs_wizards(void) { gedict_t *p; @@ -471,7 +471,7 @@ void hide_specs_wizards() } } -void show_specs_wizards() +void show_specs_wizards(void) { gedict_t *p; @@ -481,7 +481,7 @@ void show_specs_wizards() } } -void FixSpecWizards() +void FixSpecWizards(void) { static int k_asw = -1; // static diff --git a/src/stats.c b/src/stats.c index 94f57005..c32ff325 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1290,7 +1290,7 @@ void TopStats(void) "\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\237\n"); } -void TopMidairStats() +void TopMidairStats(void) { gedict_t *p; float f1, vh_rl, a_rl, ph_rl, maxtopheight = 0, maxtopavgheight = 0, maxrlefficiency = 0; diff --git a/src/statsTables.c b/src/statsTables.c index fb91b26e..f7fb825b 100644 --- a/src/statsTables.c +++ b/src/statsTables.c @@ -567,7 +567,7 @@ static void playerMidairKillStats(void) } } -static void topMidairStats() +static void topMidairStats(void) { gedict_t *p; float f1; @@ -781,7 +781,7 @@ static void topMidairStats() "\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\237\n\n"); } -static void playerInstagibStats() +static void playerInstagibStats(void) { gedict_t *p; gedict_t *p2; @@ -838,7 +838,7 @@ static void playerInstagibStats() } } -static void playerInstagibKillStats() +static void playerInstagibKillStats(void) { gedict_t *p; gedict_t *p2; @@ -893,7 +893,7 @@ static void playerInstagibKillStats() } } -static void playerLGCStats() +static void playerLGCStats(void) { gedict_t *p; gedict_t *p2; diff --git a/src/subs.c b/src/subs.c index f4407a7d..97f9052d 100644 --- a/src/subs.c +++ b/src/subs.c @@ -29,7 +29,7 @@ QuakeEd only writes a single float for angles (bad idea), so up and down are just constant angles. */ -void SetMovedir() +void SetMovedir(void) { if (VectorCompareF(self->s.v.angles, 0, -1, 0)) { @@ -53,7 +53,7 @@ void SetMovedir() InitTrigger ================ */ -void InitTrigger() +void InitTrigger(void) { // trigger angles are used for one-way touches. An angle of 0 is assumed // to mean no restrictions, so use a yaw of 360 instead. @@ -77,8 +77,8 @@ void InitTrigger() self.origin traveling at speed =============== */ -void SUB_CalcMoveDone(); -void SUB_CalcMoveEnt(gedict_t *ent, vec3_t tdest, float tspeed, void (*func)()) +void SUB_CalcMoveDone(void); +void SUB_CalcMoveEnt(gedict_t *ent, vec3_t tdest, float tspeed, void (*func)(void)) { gedict_t *stemp; @@ -89,7 +89,7 @@ void SUB_CalcMoveEnt(gedict_t *ent, vec3_t tdest, float tspeed, void (*func)()) self = stemp; } -void SUB_CalcMove(vec3_t tdest, float tspeed, void (*func)()) +void SUB_CalcMove(vec3_t tdest, float tspeed, void (*func)(void)) { vec3_t vdestdelta; float len, traveltime; @@ -137,7 +137,7 @@ void SUB_CalcMove(vec3_t tdest, float tspeed, void (*func)()) After moving, set origin to exact final destination ============ */ -void SUB_CalcMoveDone() +void SUB_CalcMoveDone(void) { setorigin(self, PASSVEC3(self->finaldest)); @@ -212,10 +212,10 @@ void SUB_CalcMoveDone() }*/ //============================================================================= -void SUB_UseTargets(); +void SUB_UseTargets(void); gedict_t *activator; -void DelayThink() +void DelayThink(void) { activator = PROG_TO_EDICT(self->s.v.enemy); @@ -242,7 +242,7 @@ void DelayThink() ============================== */ -void SUB_UseTargets() +void SUB_UseTargets(void) { gedict_t *t, *stemp, *otemp, *act; @@ -318,7 +318,7 @@ void SUB_UseTargets() { if (self->use) { - ((void (*)())(self->use))(); + ((void (*)(void))(self->use))(); } } diff --git a/src/triggers.c b/src/triggers.c index cce9ea7f..9cb52f6d 100644 --- a/src/triggers.c +++ b/src/triggers.c @@ -29,7 +29,7 @@ gedict_t *stemp, *otemp, *old; qbool BotsPreTeleport(gedict_t *self, gedict_t *other); void BotsPostTeleport(gedict_t *self, gedict_t *other, gedict_t *teleport_destination); -void trigger_reactivate() +void trigger_reactivate(void) { self->s.v.solid = SOLID_TRIGGER; } @@ -40,7 +40,7 @@ void trigger_reactivate() #define SPAWNFLAG_NOTOUCH 1 // the wait g_globalvars.time has passed, so set back up for another activation -void multi_wait() +void multi_wait(void) { if (self->s.v.max_health) { @@ -53,7 +53,7 @@ void multi_wait() // the trigger was just touched/killed/used // self->s.v.enemy should be set to the activator so it can be held through a delay // so wait for the delay g_globalvars.time before firing -void multi_trigger() +void multi_trigger(void) { if (self->s.v.nextthink > g_globalvars.time) { @@ -97,19 +97,19 @@ void multi_trigger() } } -void multi_killed() +void multi_killed(void) { self->s.v.enemy = EDICT_TO_PROG(damage_attacker); multi_trigger(); } -void multi_use() +void multi_use(void) { self->s.v.enemy = EDICT_TO_PROG(activator); multi_trigger(); } -void multi_touch() +void multi_touch(void) { // #practice mode# if (!k_practice && (match_in_progress != 2)) @@ -154,7 +154,7 @@ void multi_touch() 4) set "message" to text string */ -void SP_trigger_multiple() +void SP_trigger_multiple(void) { if (self->s.v.sounds == 1) { @@ -216,7 +216,7 @@ void SP_trigger_multiple() 4) set "message" to text string */ -void SP_trigger_once() +void SP_trigger_once(void) { self->wait = -1; SP_trigger_multiple(); @@ -227,7 +227,7 @@ void SP_trigger_once() /*QUAKED trigger_relay (.5 .5 .5) (-8 -8 -8) (8 8 8) This fixed size trigger cannot be touched, it can only be fired by other events. It can contain killtargets, targets, delays, and messages. */ -void SP_trigger_relay() +void SP_trigger_relay(void) { self->use = (func_t) SUB_UseTargets; } @@ -243,7 +243,7 @@ void SP_trigger_relay() 4) set "message" to text string */ -void SP_trigger_secret() +void SP_trigger_secret(void) { g_globalvars.total_secrets = g_globalvars.total_secrets + 1; self->wait = -1; @@ -269,7 +269,7 @@ void SP_trigger_secret() //============================================================================= -void counter_use() +void counter_use(void) { // char* junk; @@ -320,7 +320,7 @@ void counter_use() After the counter has been triggered "count" g_globalvars.times (default 2), it will fire all of it's targets and remove itself. */ -void SP_trigger_counter() +void SP_trigger_counter(void) { self->wait = -1; if (!self->count) @@ -392,7 +392,7 @@ void spawn_tfog(vec3_t org) } /* - void tdeath_touch() + void tdeath_touch(void) { gedict_t *other2; @@ -445,7 +445,7 @@ void spawn_tfog(vec3_t org) */ // { NOTE: retarded code, just so monsters able double telefrag each other, for example "e1m7" -void tdeath_touch() +void tdeath_touch(void) { gedict_t *other2; @@ -694,7 +694,7 @@ void teleport_player(gedict_t *player, vec3_t origin, vec3_t angles, int flags) } } -void teleport_touch() +void teleport_touch(void) { gedict_t *t; @@ -770,7 +770,7 @@ void teleport_touch() /*QUAKED info_teleport_destination (.5 .5 .5) (-8 -8 -8) (8 8 32) This is the destination marker for a teleporter. It should have a "targetname" field with the same value as a teleporter's "target" field. */ -void SP_info_teleport_destination() +void SP_info_teleport_destination(void) { // this does nothing, just serves as a target spot VectorCopy(self->s.v.angles, self->mangle); @@ -784,7 +784,7 @@ void SP_info_teleport_destination() } } -void teleport_use() +void teleport_use(void) { self->s.v.nextthink = g_globalvars.time + 0.2; g_globalvars.force_retouch = 2; // make sure even still objects get hit @@ -796,7 +796,7 @@ void teleport_use() If the trigger_teleport has a targetname, it will only teleport entities when it has been fired. */ -void SP_trigger_teleport() +void SP_trigger_teleport(void) { vec3_t o; @@ -820,7 +820,7 @@ void SP_trigger_teleport() } } -void SP_trigger_custom_teleport() +void SP_trigger_custom_teleport(void) { // set real classname self->classname = "trigger_teleport"; @@ -845,7 +845,7 @@ void SP_trigger_custom_teleport() ============================================================================== */ -void trigger_skill_touch() +void trigger_skill_touch(void) { if (other->ct != ctPlayer) { @@ -859,7 +859,7 @@ void trigger_skill_touch() sets skill level to the value of "message". Only used on start map. */ -void SP_trigger_setskill() +void SP_trigger_setskill(void) { if (deathmatch) { @@ -885,7 +885,7 @@ void SP_trigger_setskill() ============================================================================== */ -void trigger_onlyregistered_touch() +void trigger_onlyregistered_touch(void) { if (other->ct != ctPlayer) { @@ -918,7 +918,7 @@ void trigger_onlyregistered_touch() /*QUAKED trigger_onlyregistered (.5 .5 .5) ? Only fires if playing the registered version, otherwise prints the message */ -void SP_trigger_onlyregistered() +void SP_trigger_onlyregistered(void) { trap_precache_sound("misc/talk.wav"); InitTrigger(); @@ -927,7 +927,7 @@ void SP_trigger_onlyregistered() //============================================================================ -void hurt_on() +void hurt_on(void) { self->s.v.solid = SOLID_TRIGGER; self->s.v.nextthink = -1; @@ -935,7 +935,7 @@ void hurt_on() g_globalvars.force_retouch = 2; // make sure even still objects get hit } -void hurt_items() +void hurt_items(void) { if (cvar("k_ctf_hurt_items")) { @@ -952,7 +952,7 @@ void hurt_items() } } -void hurt_touch() +void hurt_touch(void) { if (!other->s.v.takedamage) { @@ -972,7 +972,7 @@ void hurt_touch() set dmg to damage amount defalt dmg = 5 */ -void SP_trigger_hurt() +void SP_trigger_hurt(void) { if (streq("end", mapname) && cvar("k_remove_end_hurt")) { @@ -993,7 +993,7 @@ void SP_trigger_hurt() #define PUSH_ONCE 1 -void trigger_push_touch() +void trigger_push_touch(void) { if (streq(other->classname, "grenade")) { @@ -1027,7 +1027,7 @@ void trigger_push_touch() /*QUAKED trigger_push (.5 .5 .5) ? PUSH_ONCE Pushes the player */ -void SP_trigger_push() +void SP_trigger_push(void) { InitTrigger(); self->touch = (func_t) trigger_push_touch; @@ -1037,7 +1037,7 @@ void SP_trigger_push() } } -void SP_trigger_custom_push() +void SP_trigger_custom_push(void) { // set real classname self->classname = "trigger_push"; @@ -1053,7 +1053,7 @@ void SP_trigger_custom_push() //============================================================================ -void trigger_monsterjump_touch() +void trigger_monsterjump_touch(void) { if (((int)other->s.v.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER) { @@ -1079,7 +1079,7 @@ void trigger_monsterjump_touch() "speed" default to 200, the speed thrown forward "height" default to 200, the speed thrown upwards */ -void SP_trigger_monsterjump() +void SP_trigger_monsterjump(void) { if (!self->speed) { @@ -1100,7 +1100,7 @@ void SP_trigger_monsterjump() self->touch = (func_t) trigger_monsterjump_touch; } -void SP_trigger_custom_monsterjump() +void SP_trigger_custom_monsterjump(void) { // set real classname self->classname = "trigger_monsterjump"; @@ -1116,7 +1116,7 @@ void SP_trigger_custom_monsterjump() float T_Heal(gedict_t *e, float healamount, float ignore); -static void trigger_heal_touch() +static void trigger_heal_touch(void) { if ((match_in_progress == 1) || (!match_in_progress && cvar("k_freeze"))) { @@ -1150,7 +1150,7 @@ static void trigger_heal_touch() } } -void SP_trigger_heal() +void SP_trigger_heal(void) { if (strnull(self->noise)) self->noise = "items/r_item1.wav"; diff --git a/src/vote.c b/src/vote.c index b78f84a0..50b17f88 100644 --- a/src/vote.c +++ b/src/vote.c @@ -36,7 +36,7 @@ void BecomeCoach(gedict_t *p); // AbortElect is used to terminate the voting // Important if player to be elected disconnects or levelchange happens -void AbortElect() +void AbortElect(void) { gedict_t *p; @@ -68,7 +68,7 @@ void AbortElect() } } -void ElectThink() +void ElectThink(void) { G_bprint(2, "The voting has timed out.\n" "Election aborted\n"); @@ -77,7 +77,7 @@ void ElectThink() AbortElect(); } -void VoteYes() +void VoteYes(void) { int votes; @@ -114,7 +114,7 @@ void VoteYes() vote_check_elect(); } -void VoteNo() +void VoteNo(void) { int votes; @@ -372,7 +372,7 @@ qbool is_elected(gedict_t *p, electType_t et) return (p->v.elect_type == et); } -int get_elect_type() +int get_elect_type(void) { gedict_t *p; @@ -397,7 +397,7 @@ int get_elect_type() return etNone; } -char* get_elect_type_str() +char* get_elect_type_str(void) { switch (get_elect_type()) { @@ -425,7 +425,7 @@ votemap_t maps_voted[MAX_CLIENTS]; // return the index in maps_voted[] of most voted map // return -1 inf no votes at all or some failures // if admin votes for map - map will be treated as most voted -int vote_get_maps() +int vote_get_maps(void) { int best_idx = -1, i; gedict_t *p; @@ -488,7 +488,7 @@ int vote_get_maps() return (maps_voted_idx = best_idx); } -void vote_check_map() +void vote_check_map(void) { int vt_req; char *map; @@ -520,7 +520,7 @@ void vote_check_map() changelevel(map); } -void vote_check_break() +void vote_check_break(void) { if (!match_in_progress || intermission_running || match_over) { @@ -542,7 +542,7 @@ void vote_check_break() } } -void vote_check_elect() +void vote_check_elect(void) { gedict_t *p; @@ -593,7 +593,7 @@ void vote_check_elect() } // !!! do not confuse rpickup and pickup -void vote_check_pickup() +void vote_check_pickup(void) { gedict_t *p; int veto; @@ -803,7 +803,7 @@ void FixNoSpecs(void) } } -void vote_check_nospecs() +void vote_check_nospecs(void) { int veto; @@ -869,7 +869,7 @@ void vote_check_nospecs() } } -void nospecs() +void nospecs(void) { int votes; @@ -906,7 +906,7 @@ void nospecs() vote_check_nospecs(); } -void vote_check_teamoverlay() +void vote_check_teamoverlay(void) { int veto; @@ -943,7 +943,7 @@ void vote_check_teamoverlay() } } -void teamoverlay() +void teamoverlay(void) { int votes; @@ -983,7 +983,7 @@ void teamoverlay() qbool force_map_reset = false; // { votecoop -void vote_check_coop() +void vote_check_coop(void) { int veto; @@ -1035,7 +1035,7 @@ void vote_check_coop() } } -void votecoop() +void votecoop(void) { int votes; @@ -1064,7 +1064,7 @@ void votecoop() // } // { votehook -void hooksmooth() +void hooksmooth(void) { int votes, veto; @@ -1107,7 +1107,7 @@ void hooksmooth() } } -void hookfast() +void hookfast(void) { int votes, veto; @@ -1151,7 +1151,7 @@ void hookfast() } } -void hookclassic() +void hookclassic(void) { int votes, veto; @@ -1195,7 +1195,7 @@ void hookclassic() } } -void hookcrhook() +void hookcrhook(void) { int votes, veto; @@ -1243,7 +1243,7 @@ void hookcrhook() // { antilag vote feature -void vote_check_antilag() +void vote_check_antilag(void) { int veto; @@ -1283,7 +1283,7 @@ void vote_check_antilag() } } -void antilag() +void antilag(void) { int votes; @@ -1490,7 +1490,7 @@ qbool private_game_by_default(void) return cvar("k_privategame_default"); } -void vote_check_swapall() +void vote_check_swapall(void) { int veto; gedict_t *p; diff --git a/src/weapons.c b/src/weapons.c index dd7207cf..8de407cc 100644 --- a/src/weapons.c +++ b/src/weapons.c @@ -25,9 +25,9 @@ #include "g_local.h" -void ReportMe(); -void AdminImpBot(); -void CaptainPickPlayer(); +void ReportMe(void); +void AdminImpBot(void); +void CaptainPickPlayer(void); void ChasecamToggleButton(void); void ClanArenaTrackingToggleButton(void); @@ -46,7 +46,7 @@ void AmmoUsed(gedict_t *player) } // called by SP_worldspawn -void W_Precache() +void W_Precache(void) { trap_precache_sound("weapons/r_exp3.wav"); // new rocket explosion trap_precache_sound("weapons/rocket1i.wav"); // spike gun @@ -68,14 +68,14 @@ void W_Precache() } void W_FireSpikes(float ox); -void W_FireLightning(); +void W_FireLightning(void); /* ================ W_FireAxe ================ */ -void W_FireAxe() +void W_FireAxe(void) { vec3_t source, dest; vec3_t org; @@ -273,7 +273,7 @@ float blood_count; vec3_t puff_org; float puff_count; -void ClearMultiDamage() +void ClearMultiDamage(void) { multi_ent = world; multi_damage = 0; @@ -282,7 +282,7 @@ void ClearMultiDamage() multi_damage_type = dtNONE; } -void ApplyMultiDamage() +void ApplyMultiDamage(void) { if (multi_ent == world) { @@ -312,7 +312,7 @@ void AddMultiDamage(gedict_t *hit, float damage) } } -void Multi_Finish() +void Multi_Finish(void) { if (puff_count) { @@ -427,7 +427,7 @@ void TraceAttack(float damage, vec3_t dir, qbool send_effects) Used by coilgun for Instagib mode, bullet doesn't stop at first player, it goes through till it hits wall ================ */ -void T_InstaKickback(); +void T_InstaKickback(void); void FireInstaBullet(vec3_t dir, deathType_t deathtype) { vec3_t src, dst, tmp; @@ -735,7 +735,7 @@ void FireBullets(float shotcount, vec3_t dir, float spread_x, float spread_y, fl #ifdef HITBOXCHECK -void W_FireShotgun() +void W_FireShotgun(void) { qbool classic_shotgun = cvar("k_classic_shotgun"); vec3_t dir, s_dir, src, o_src, eorg, tmp; @@ -796,7 +796,7 @@ void W_FireShotgun() } } #else -void W_FireShotgun() +void W_FireShotgun(void) { vec3_t dir; int bullets = 6; @@ -852,7 +852,7 @@ void W_FireShotgun() W_FireSuperShotgun ================ */ -void W_FireSuperShotgun() +void W_FireSuperShotgun(void) { vec3_t dir; int bullets = (k_yawnmode ? 21 : 14); @@ -915,7 +915,7 @@ void FixQuad(gedict_t *owner) } } -void T_InstaKickback() +void T_InstaKickback(void) { vec3_t tmp; @@ -944,7 +944,7 @@ void T_InstaKickback() ent_remove(self); } -void T_MissileTouch() +void T_MissileTouch(void) { float damg; vec3_t tmp; @@ -1026,7 +1026,7 @@ void T_MissileTouch() ================ */ -void W_FireRocket() +void W_FireRocket(void) { WS_Mark(self, wpRL); @@ -1153,7 +1153,7 @@ void LightningDamage(vec3_t p1, vec3_t p2, gedict_t *from, float damage) } } -void W_FireLightning() +void W_FireLightning(void) { vec3_t org; float cells; @@ -1277,7 +1277,7 @@ void W_FireLightning() //============================================================================= -void GrenadeExplode() +void GrenadeExplode(void) { if (self->voided) { @@ -1308,7 +1308,7 @@ void GrenadeExplode() ent_remove(self); } -void GrenadeTouch() +void GrenadeTouch(void) { if (other == PROG_TO_EDICT(self->s.v.owner)) { @@ -1349,7 +1349,7 @@ void GrenadeTouch() W_FireGrenade ================ */ -void W_FireGrenade() +void W_FireGrenade(void) { float r1 = crandom(), r2 = crandom(); vec3_t ang; @@ -1444,7 +1444,7 @@ void W_FireGrenade() //============================================================================= -void spike_touch(); +void spike_touch(void); /* =============== @@ -1503,7 +1503,7 @@ static qbool race_ignore_spike(gedict_t *self, gedict_t *other) return PROG_TO_EDICT(self->s.v.owner)->ct == ctPlayer; } -void spike_touch() +void spike_touch(void) { if (other == PROG_TO_EDICT(self->s.v.owner)) { @@ -1576,7 +1576,7 @@ void spike_touch() ent_remove(self); } -void superspike_touch() +void superspike_touch(void) { if (other == PROG_TO_EDICT(self->s.v.owner)) { @@ -1635,7 +1635,7 @@ void superspike_touch() ent_remove(self); } -void W_FireSuperSpikes() +void W_FireSuperSpikes(void) { vec3_t dir, tmp; @@ -1732,7 +1732,7 @@ void W_FireSpikes(float ox) =============================================================================== */ -void W_SetCurrentAmmo() +void W_SetCurrentAmmo(void) { qbool need_fix = false; int items; @@ -1962,7 +1962,7 @@ void W_SetCurrentAmmo() self->s.v.items = items; } -float W_BestWeapon() +float W_BestWeapon(void) { int it = self->s.v.items; char *w_rank = ezinfokey(self, "w_rank"); @@ -2057,7 +2057,7 @@ float W_BestWeapon() return ((it & IT_AXE) ? IT_AXE : 0); } -int W_CheckNoAmmo() +int W_CheckNoAmmo(void) { if (self->s.v.currentammo > 0) { @@ -2084,7 +2084,7 @@ int W_CheckNoAmmo() An attack impulse can be triggered now ============ */ -void W_Attack() +void W_Attack(void) { float r; @@ -2496,7 +2496,7 @@ qbool W_ChangeWeapon(int wp) Go to the next weapon with ammo ============ */ -qbool CycleWeaponCommand() +qbool CycleWeaponCommand(void) { int i, it, am; @@ -2595,7 +2595,7 @@ qbool CycleWeaponCommand() Go to the prev weapon with ammo ============ */ -qbool CycleWeaponReverseCommand() +qbool CycleWeaponReverseCommand(void) { int i, it, am; @@ -2694,10 +2694,10 @@ qbool CycleWeaponReverseCommand() return true; } -void kfjump(); -void krjump(); +void kfjump(void); +void krjump(void); -int CaptainImpulses() +int CaptainImpulses(void) { if (k_captains != 2) { @@ -2721,7 +2721,7 @@ int CaptainImpulses() ============ */ -void ImpulseCommands() +void ImpulseCommands(void) { qbool clear = true; int capt, impulse = self->s.v.impulse; @@ -2870,7 +2870,7 @@ qbool can_prewar(qbool fire) Called every frame so impulse events can be handled as well as possible ============ */ -void W_WeaponFrame() +void W_WeaponFrame(void) { if ((self->spawn_time + 0.05) > g_globalvars.time) { @@ -2947,7 +2947,7 @@ void W_WeaponFrame() Plays sound if needed ======== */ -void SuperDamageSound() +void SuperDamageSound(void) { if (self->super_damage_finished > g_globalvars.time) { diff --git a/src/world.c b/src/world.c index 0319d7f8..66aa2425 100644 --- a/src/world.c +++ b/src/world.c @@ -29,21 +29,21 @@ #endif void RegisterSkillVariables(void); -void SUB_regen(); -void CheckAll(); -void FixSpecWizards(); -void FixSayFloodProtect(); -void FixRules(); -void ShowSpawnPoints(); -void r_route(); +void SUB_regen(void); +void CheckAll(void); +void FixSpecWizards(void); +void FixSayFloodProtect(void); +void FixRules(void); +void ShowSpawnPoints(void); +void r_route(void); void LoadMap(void); -void SP_trigger_custom_push(); +void SP_trigger_custom_push(void); #define MAX_BODYQUE 4 gedict_t *bodyque[MAX_BODYQUE]; int bodyque_head; -void InitBodyQue() +void InitBodyQue(void) { int i; @@ -89,7 +89,7 @@ void CopyToBodyQue(gedict_t *ent) } } -void ClearBodyQue() +void ClearBodyQue(void) { int i; @@ -104,7 +104,7 @@ void ClearBodyQue() bodyque_head = 0; } -void CheckDefMap() +void CheckDefMap(void) { int player_count = CountPlayers(); int bot_count = CountBots(); @@ -151,7 +151,7 @@ void Spawn_DefMapChecker(float timeout) float max_map_uptime = 3600 * 12; // 12 hours -void Check_LongMapUptime() +void Check_LongMapUptime(void) { if (match_in_progress) { @@ -177,9 +177,9 @@ void Check_LongMapUptime() changelevel(mapname); } -void SP_item_artifact_super_damage(); +void SP_item_artifact_super_damage(void); -void SP_worldspawn() +void SP_worldspawn(void) { char *s; @@ -563,8 +563,8 @@ void SP_worldspawn() } } -void ShowSpawnPoints(); -void Customize_Maps() +void ShowSpawnPoints(void); +void Customize_Maps(void) { gedict_t *p; @@ -752,7 +752,7 @@ qbool RegisterCvar(const char *var) } // in the first frame - even world is not spawned yet -void FirstFrame() +void FirstFrame(void) { int i, um_idx; qbool matchless_was_forced = false; @@ -1141,7 +1141,7 @@ void FirstFrame() } // items spawned, but probably not solid yet -void SecondFrame() +void SecondFrame(void) { if (framecount != 2) { @@ -1155,7 +1155,7 @@ void SecondFrame() HM_restore_spawns(); } -void CheckSvUnlock() +void CheckSvUnlock(void) { if (k_sv_locktime && (k_sv_locktime < g_globalvars.time)) { @@ -1234,7 +1234,7 @@ void CheckAutoXonX(qbool use_time) } // called when switching to/from ctf mode. -void FixCTFItems() +void FixCTFItems(void) { static gameType_t old_k_mode = 0; // static static int k_ctf_runes = 0; // static @@ -1281,7 +1281,7 @@ void FixCTFItems() k_ctf_hook = cvar("k_ctf_hook"); } -void FixRA() +void FixRA(void) { static qbool old_k_rocketarena = false; // static @@ -1306,7 +1306,7 @@ void FixRA() } } -void FixRace() +void FixRace(void) { static qbool old_k_race = false; // static @@ -1332,7 +1332,7 @@ void FixRace() } // serve k_pow and k_pow_min_players -void FixPowerups() +void FixPowerups(void) { static int k_pow = -1; // static static int k_pow_q = -1; // static @@ -1401,7 +1401,7 @@ void FixPowerups() } } -void FixCmdFloodProtect() +void FixCmdFloodProtect(void) { k_cmd_fp_count = bound(0, cvar("k_cmd_fp_count"), MAX_FP_CMDS); k_cmd_fp_count = (k_cmd_fp_count ? k_cmd_fp_count : min(10, MAX_FP_CMDS)); @@ -1415,7 +1415,7 @@ void FixCmdFloodProtect() k_cmd_fp_disabled = bound(0, cvar("k_cmd_fp_disabled"), 1); } -void FixSayTeamToSpecs() +void FixSayTeamToSpecs(void) { int k_sayteam_to_spec = bound(0, cvar("k_sayteam_to_spec"), 3); int current_value = cvar("sv_sayteam_to_spec"); @@ -1523,9 +1523,9 @@ void SetMode4ServerInfo(void) int skip_fixrules = 0; // check if server is misconfigured somehow, made some minimum fixage -void FixRules() +void FixRules(void) { - extern void FixYawnMode(); + extern void FixYawnMode(void); gameType_t km = k_mode = cvar("k_mode"); int k_tt = bound(0, cvar("k_timetop"), 600); @@ -1799,10 +1799,10 @@ int timelimit, fraglimit, teamplay, deathmatch, framecount, coop, skill; extern float intermission_exittime; -void CheckTiming(); -void check_fcheck(); -void CheckTeamStatus(); -void SendSpecInfo(); +void CheckTiming(void); +void check_fcheck(void); +void CheckTeamStatus(void); +void SendSpecInfo(void); void DoMVDAutoTrack(void); void FixNoSpecs(void);