zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-12 21:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/games/duke/src/funct.h

260 lines
9.3 KiB
C
Raw Normal View History

- renamed a few headers.
2020-06-24 19:21:02 +00:00
#pragma once
- Big cleanup.
2020-07-06 20:23:18 +00:00
#include "screenjob.h"
-more header work.
2020-07-06 16:08:31 +00:00
#include "constants.h"
- Big cleanup.
2020-07-06 20:23:18 +00:00
- newgame is clean now.
2020-07-07 20:41:31 +00:00
struct MapRecord;
- Big cleanup.
2020-07-06 20:23:18 +00:00
BEGIN_DUKE_NS
// dumping ground for all external function prototypes to keep them out of the important headers.
- safety commit
2020-07-07 07:39:33 +00:00
// This list is not sorted in any way.
void lava_cleararrays();
void addjaildoor(int p1, int p2, int iht, int jlt, int p3, int h);
void addminecart(int p1, int p2, int i, int iht, int p3, int childsectnum);
void addtorch(int i);
void addlightning(int i);
- Big cleanup.
2020-07-06 20:23:18 +00:00
- renamed a few headers.
2020-06-24 19:21:02 +00:00
void movecyclers(void);
void movedummyplayers(void);
void resetlanepics(void);
void moveplayers();
void doanimations();
void movefx();
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
void moveclouds(void);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
- Big cleanup.
2020-07-06 20:23:18 +00:00
void RANDOMSCRAP(spritetype* s, int i);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
void ms(short i);
void movecrane(int i, int crane);
void movefountain(int i, int fountain);
void moveflammable(int i, int tire, int box, int pool);
void detonate(int i, int explosion);
void movemasterswitch(int i, int spectype1, int spectype2);
void movetrash(int i);
void movewaterdrip(int i, int drip);
void movedoorshock(int i);
void movetouchplate(int i, int plate);
void movecanwithsomething(int i);
void bounce(int i);
void movetongue(int i, int tongue, int jaw);
void moveooz(int i, int seenine, int seeninedead, int ooz, int explosion);
void lotsofstuff(spritetype* s, short n, int spawntype);
bool respawnmarker(int i, int yellow, int green);
bool rat(int i, bool makesound);
bool queball(int i, int pocket, int queball, int stripeball);
void forcesphere(int i, int forcesphere);
void recon(int i, int explosion, int firelaser, int attacksnd, int painsnd, int roamsnd, int shift, int (*getspawn)(int i));
void ooz(int i);
- fixed the reactor for good. Fixes #70
2020-08-01 07:55:48 +00:00
void reactor(int i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BURNT, int REACTORSPARK, int REACTOR2SPARK);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
void camera(int i);
void forcesphere(int i);
void watersplash2(int i);
void frameeffect1(int i);
bool money(int i, int BLOODPOOL);
bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, bool zcheck1, bool zcheck2);
bool bloodpool(int i, bool puke, int TIRE);
void shell(int i, bool morecheck);
void glasspieces(int i);
void scrap(int i, int SCRAP1, int SCRAP6);
void handle_se00(int i, int LASERLINE);
void handle_se01(int i);
void handle_se14(int i, bool checkstat, int RPG, int JIBS6);
void handle_se30(int i, int JIBS6);
void handle_se02(int i);
void handle_se03(int i);
void handle_se04(int i);
void handle_se05(int i, int FIRELASER);
void handle_se08(int i, bool checkhitag1);
void handle_se10(int i, const int *);
void handle_se11(int i);
void handle_se12(int i, int planeonly = 0);
void handle_se13(int i);
void handle_se15(int i);
void handle_se16(int i, int REACTOR, int REACTOR2);
void handle_se17(int i);
void handle_se18(int i, bool morecheck);
void handle_se19(int i, int BIGFORCE);
void handle_se20(int i);
void handle_se21(int i);
void handle_se22(int i);
void handle_se26(int i);
void handle_se27(int i);
void handle_se32(int i);
void handle_se35(int i, int SMALLSMOKE, int EXPLOSION2);
void handle_se128(int i);
void handle_se130(int i, int countmax, int EXPLOSION2);
void respawn_rrra(int i, int j);
int dodge(spritetype*);
void alterang(int a, int g_i, int g_p);
void fall_common(int g_i, int g_p, int JIBS6, int DRONE, int BLOODPOOL, int SHOTSPARK1, int squished, int thud, int(*fallspecial)(int, int), void (*falladjustz)(spritetype*));
void checkavailweapon(struct player_struct* p);
- ported RR's noise.c.
2020-06-30 15:30:48 +00:00
void deletesprite(int num);
- more header cleanup.
2020-07-06 14:24:22 +00:00
void addammo(int weapon, struct player_struct* p, int amount);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
- fixing some HUD stuff.
2020-07-06 13:48:51 +00:00
int ssp(int i, unsigned int cliptype); //The set sprite function
void insertspriteq(int i);
- Big cleanup.
2020-07-06 20:23:18 +00:00
int wakeup(int sn, int pn);
int timedexit(int snum);
void dokneeattack(int snum, int pi, const std::initializer_list<int>& respawnlist);
int endoflevel(int snum);
void playerisdead(int snum, int psectlotag, int fz, int cz);
void footprints(int snum);
int makepainsounds(int snum, int type);
void playerCrouch(int snum);
void playerJump(int snum, int fz, int cz);
- multiple input fixes for both games, and for both `cl_syncinput 0` and `cl_syncinput 1` modes. * For RR, `processweapon_r()` was performing angle and horizon changes directly which provided a harsh experience with the default `cl_syncinput 0` mode. * Added `angAdjust` variable to `player_struct` for use with ticrate angle adjustments. * Renamed `horizAngleAdjust` to `horizAdjust` so that there is less confusion with the new `angAdjust` variable. * Removed `horizSkew` variable, can just use `horizAdjust` for this. * Replaced all calls to `addang()` and `addhoriz()` with the appropriate additions/subtractions to `angAdjust` and `horizAdjust` respectively. * Removed now unused `addang()` and `addhoriz()` setters from `player_struct`. * Define new function `resetinputhelpers()` to eliminate code duplication between `processinput_d()` and `processinput_r()` functions. * Remove `p->q16ang` and `p->q16horiz` direct setting from `FinalizeInput()`. * Change `applylook()` to accept an `fixed_t adjustment` for changing the player's angle. This can either be `input.q16avel` when `cl_syncinput` is 0, or `sync[snum].q16angvel` when `cl_syncinput` is 1. * Change `sethorizon()` to accept an `fixed_t adjustment` for changing the player's horizon. This can either be `input.q16horz` when `cl_syncinput` is 0, or `sync[snum].q16horz` when `cl_syncinput` is 1. * Re-work `sethorizon()` to always adjust `p->q16horiz` using the true pitch code. This closer resembles the EDuke32 implementation as per SVN 7342. * Re-work returning to center to work off the true pitch code and always ensure that the player returns to center. * Implement work-around for RR where we need to call `sethorizon()` before the call to `fi.doincrements()` like the original game, but also after the call to `processweapon()` to apply any angle or horizon changes due to weapon recoil, etc. We work around this by calling `sethorizon()` from within `doincrements_r()` only if `cl_syncinput` is 1 and only if `doincrements_r()` is to return 1.
2020-08-03 11:19:45 +00:00
void applylook(int snum, double factor, fixed_t adjustment);
- more consolidation between old and new input paths. This also simplifies the one_eighty handling to be closer to the original idea.
2020-07-17 01:00:43 +00:00
void checklook(int snum, int sb_snum);
- Big cleanup.
2020-07-06 20:23:18 +00:00
void playerCenterView(int snum);
void playerLookUp(int snum, ESyncBits sb_snum);
void playerLookDown(int snum, ESyncBits sb_snum);
void playerAimUp(int snum, ESyncBits sb_snum);
void playerAimDown(int snum, ESyncBits sb_snum);
bool view(struct player_struct* pp, int* vx, int* vy, int* vz, short* vsectnum, int ang, int horiz);
void tracers(int x1, int y1, int z1, int x2, int y2, int z2, int n);
int hits(int i);
int hitasprite(int i, short* hitsp);
int aim(spritetype* s, int aang);
void checkweapons(struct player_struct* const p);
int findotherplayer(int p, int* d);
void quickkill(struct player_struct* p);
void setpal(struct player_struct* p);
int madenoise(int playerNum);
int haskey(int sect, int snum);
void breakwall(short newpn, short spr, short dawallnum);
void callsound2(int soundNum, int playerNum);
- "po" reverted
2020-07-06 21:33:33 +00:00
int callsound(int sectnum,int snum);
int hitasprite(int snum,short *hitSprite);
- Big cleanup.
2020-07-06 20:23:18 +00:00
int findplayer(const spritetype* s, int* dist);
void operatejaildoors(int hitag);
void allignwarpelevators(void);
bool isablockdoor(int tileNum);
bool activatewarpelevators(int s, int w);
int check_activator_motion(int lotag);
void operateactivators(int l, int w);
void operateforcefields_common(int s, int low, const std::initializer_list<int>& tiles);
void operatemasterswitches(int lotag);
void operatesectors(int s, int i);
void hud_input(int playerNum);
- first stage of new savegame code. This also refactors the animateptr array into something serializable. This kind of pointer lookup is virtually unrestorable without creating platform locked savegames.
2020-07-20 18:40:29 +00:00
int getanimationgoal(int animtype, int animindex);
- Big cleanup.
2020-07-06 20:23:18 +00:00
bool isanearoperator(int lotag);
bool isanunderoperator(int lotag);
- first stage of new savegame code. This also refactors the animateptr array into something serializable. This kind of pointer lookup is virtually unrestorable without creating platform locked savegames.
2020-07-20 18:40:29 +00:00
int setanimation(short animsect, int animtype, int animindex, int thegoal, int thevel);
- "po" reverted
2020-07-06 21:33:33 +00:00
void dofurniture(int wallNum, int sectnum, int playerNum);
- Big cleanup.
2020-07-06 20:23:18 +00:00
void dotorch();
- "po" reverted
2020-07-06 21:33:33 +00:00
int hitawall(struct player_struct* pl, int* hitWall);
int hits(int snum);
- Big cleanup.
2020-07-06 20:23:18 +00:00
void clearsectinterpolate(int sprnum);
void setsectinterpolate(int sprnum);
- "po" reverted
2020-07-06 21:33:33 +00:00
int LocateTheLocator(int const tag, int const sectnum);
- Big cleanup.
2020-07-06 20:23:18 +00:00
void clearcamera(player_struct* ps);
- rewrote the ScreenJob player as a class that can be called by an asynchronous dispatcher. Works, except for timing issues with ANMs.
2020-07-19 09:57:00 +00:00
void showtwoscreens(const CompletionFunc& func);
void doorders(const CompletionFunc& func);
- Big cleanup.
2020-07-06 20:23:18 +00:00
- cleaned out another header file.
2020-07-06 15:30:23 +00:00
void execute(int s, int p, int d);
void makeitfall(int s);
- "po" reverted
2020-07-06 21:33:33 +00:00
int furthestangle(int snum, int angDiv);
- cleaned out another header file.
2020-07-06 15:30:23 +00:00
void getglobalz(int s);
int getincangle(int c, int n);
void OnEvent(int id, int pnum = -1, int snum = -1, int dist = -1);
-more header work.
2020-07-06 16:08:31 +00:00
short EGS(short whatsect, int s_x, int s_y, int s_z, short s_pn, signed char s_s, signed char s_xr, signed char s_yr, short s_a, short s_ve, int s_zv, short s_ow, signed char s_ss);
- "po" reverted
2020-07-06 21:33:33 +00:00
void ceilingglass(int snum, int sectnum, int cnt);
void spriteglass(int snum, int cnt);
void lotsofcolourglass(int snum, int wallNum, int cnt);
void lotsofglass(int snum, int wallnum, int cnt);
-more header work.
2020-07-06 16:08:31 +00:00
void addspritetodelete(int spnum);
void checkavailinven(struct player_struct* p);
int initspriteforspawn(int j, int pn, const std::initializer_list<int> &excludes);
void spawninitdefault(int j, int i);
void spawntransporter(int j, int i, bool beam);
int spawnbloodpoolpart1(int j, int i);
void initfootprint(int j, int i);
void initshell(int j, int i, bool isshell);
void initcrane(int j, int i, int CRANEPOLE);
void initwaterdrip(int j, int i);
int initreactor(int j, int i, bool isrecon);
void spawneffector(int i);
void gameexitfrommenu();
- cleanup on pausing code.
2020-07-15 16:10:31 +00:00
int startrts(int lumpNum, int localPlayer);
-more header work.
2020-07-06 16:08:31 +00:00
- cleanup continues.
2020-07-06 19:10:20 +00:00
void pickrandomspot(int pn);
void resetinventory(int pn);
void resetplayerstats(int pn);
void resetweapons(int pn);
void resetprestat(int snum, int g);
void clearfifo(void);
void prelevel_common(int g);
- safety commit - does not compile!
2020-07-07 11:19:09 +00:00
void cacheit_d();
void cacheit_r();
- cleanup continues.
2020-07-06 19:10:20 +00:00
- "po" reverted
2020-07-06 21:33:33 +00:00
void FTA(int q, struct player_struct* p);
void OnMotorcycle(player_struct *pl, int snum);
void OffMotorcycle(player_struct *pl);
void OnBoat(player_struct *pl, int snum);
void OffBoat(player_struct *pl);
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
void drawstatusbar_d(int snum);
void drawstatusbar_r(int snum);
void drawoverheadmap(int cposx, int cposy, int czoom, int cang);
void cameratext(int i);
- rewrote the ScreenJob player as a class that can be called by an asynchronous dispatcher. Works, except for timing issues with ANMs.
2020-07-19 09:57:00 +00:00
void dobonus(int bonusonly, const CompletionFunc& completion);
void dobonus_d(bool bonusonly, const CompletionFunc& completion);
void dobonus_r(bool bonusonly, const CompletionFunc& completion);
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
- change returned value for `CalcSmoothRatio()` from int to double and pass through to `displayrest()` for future use with `displayweapon()`. * `displayrooms()` ultimately should be adjusted as well. For now, just relying on integer truncation as this is just a proof of concept. # Conflicts: # source/core/gamecontrol.cpp # source/core/gamecontrol.h
2020-08-02 04:28:07 +00:00
void displayrest(double smoothratio);
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
void drawbackground(void);
void displayrooms(int32_t playerNum, int32_t smoothratio);
void setgamepalette(int palid);
- safety commit - does not compile!
2020-07-07 11:19:09 +00:00
void resetmys();
- another safety commit.
2020-07-07 15:56:20 +00:00
void resettimevars();
bool setnextmap(bool checksecretexit);
void prelevel_d(int g);
void prelevel_r(int g);
- rewrote the ScreenJob player as a class that can be called by an asynchronous dispatcher. Works, except for timing issues with ANMs.
2020-07-19 09:57:00 +00:00
void e4intro(const CompletionFunc& completion);
- restructured exitlevel for asynchronous handling of the summary screen.
2020-07-18 22:53:13 +00:00
void exitlevel();
- newgame is clean now.
2020-07-07 20:41:31 +00:00
int enterlevel(MapRecord* mi, int gm);
- changed startnewgame to handle the screen jobs asynchronously.
2020-07-18 22:26:36 +00:00
void donewgame(MapRecord* map, int sk);
- cleanup on pausing code.
2020-07-15 16:10:31 +00:00
void startnewgame(MapRecord* map, int skill);
void setlocalplayerinput(player_struct *pp);
void PlayerColorChanged(void);
- transitioned the local input handler. There wasn't anything EDuke32-specific in there - nearly everything mapped perfectly to JFDuke.
2020-07-15 17:48:04 +00:00
void nonsharedkeys(void);
- changed all SYNCINPUT #defines into runtime checks so that both parts can be used and consolidated the 4 versions of the SeaSick code.
2020-07-16 15:59:25 +00:00
void apply_seasick(player_struct* p, double scalefactor);
- cleanup of the main input code. Only 8 kb code left that is clearly recognizable as coming from EDuke32.
2020-07-17 22:34:20 +00:00
void calcviewpitch(player_struct* p, double factor);
- properly tune `sethorizon()` so that 'frominput' bool can be removed. Returning to centre function is essentially consistent between input states now.
2020-08-05 07:59:01 +00:00
void sethorizon(int snum, int sb_snum, double factor, fixed_t adjustment);
- consolidated the movement block check after discovering that it wasn't handling things properly for all games.
2020-07-17 23:34:13 +00:00
bool movementBlocked(int snum);
- moved the main loop to gameloop.cpp.
2020-07-18 09:56:49 +00:00
void GetInput();
- merged the two main loops into one. Yet to do: Run the screen jobs from the main loop as well.
2020-07-18 21:50:46 +00:00
void startmainmenu();
- put the entire CON parser into a class to make its state local to the caller
2020-07-19 17:13:27 +00:00
void loadcons();
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
- started sorting variables in globals.h and removed player.h after cleaning it out.
2020-07-19 20:34:59 +00:00
void updateinterpolations();
void restoreinterpolations();
void setinterpolation(int* posptr);
void stopinterpolation(int* posptr);
void dointerpolations(int smoothratio);
- implemented most of the savegame code and deleted the old one.
2020-07-20 21:07:44 +00:00
int* animateptr(int i);
- removed all the intermediate variables for the status bar size. hud_size now gets used directly by the status bar code.
2020-07-25 11:26:56 +00:00
void updateviewport(void);
- started sorting variables in globals.h and removed player.h after cleaning it out.
2020-07-19 20:34:59 +00:00
- remove redundant if statement left over from 2260c2353dbdbf403dd466e8952bb0cbebc2f7b6.
2020-07-29 22:49:01 +00:00
void backuppos(player_struct* p, bool noclipping = false);
- re-factor interpolation backups into discrete functions for calling from multiple places. Fixes #66.
2020-07-29 22:24:27 +00:00
void backuplook(player_struct* p);
void backupview(player_struct* p);
- backup `p->kickback_pic` in prep for interpolation and tidy up other weapon interpolation variables.
2020-08-03 03:28:16 +00:00
void backupweapon(player_struct* p);
- multiple input fixes for both games, and for both `cl_syncinput 0` and `cl_syncinput 1` modes. * For RR, `processweapon_r()` was performing angle and horizon changes directly which provided a harsh experience with the default `cl_syncinput 0` mode. * Added `angAdjust` variable to `player_struct` for use with ticrate angle adjustments. * Renamed `horizAngleAdjust` to `horizAdjust` so that there is less confusion with the new `angAdjust` variable. * Removed `horizSkew` variable, can just use `horizAdjust` for this. * Replaced all calls to `addang()` and `addhoriz()` with the appropriate additions/subtractions to `angAdjust` and `horizAdjust` respectively. * Removed now unused `addang()` and `addhoriz()` setters from `player_struct`. * Define new function `resetinputhelpers()` to eliminate code duplication between `processinput_d()` and `processinput_r()` functions. * Remove `p->q16ang` and `p->q16horiz` direct setting from `FinalizeInput()`. * Change `applylook()` to accept an `fixed_t adjustment` for changing the player's angle. This can either be `input.q16avel` when `cl_syncinput` is 0, or `sync[snum].q16angvel` when `cl_syncinput` is 1. * Change `sethorizon()` to accept an `fixed_t adjustment` for changing the player's horizon. This can either be `input.q16horz` when `cl_syncinput` is 0, or `sync[snum].q16horz` when `cl_syncinput` is 1. * Re-work `sethorizon()` to always adjust `p->q16horiz` using the true pitch code. This closer resembles the EDuke32 implementation as per SVN 7342. * Re-work returning to center to work off the true pitch code and always ensure that the player returns to center. * Implement work-around for RR where we need to call `sethorizon()` before the call to `fi.doincrements()` like the original game, but also after the call to `processweapon()` to apply any angle or horizon changes due to weapon recoil, etc. We work around this by calling `sethorizon()` from within `doincrements_r()` only if `cl_syncinput` is 1 and only if `doincrements_r()` is to return 1.
2020-08-03 11:19:45 +00:00
void resetinputhelpers(player_struct* p);
- revert most of e474ebc2b75514459ffeace8a1cfd298b9074512 and adjust player's angle/horizon in a way that's compatible with `cl_syncinput 0` and `cl_syncinput 1`. Previous attempts at leveraging `applylook()` and `sethorizon()` in different spots had pros and cons, but ultimately changing where these functions were called from was a net negative and had hard to diagnose issues. Maintaining two types of player input is considerable work. Lessons have been learned and will be beneficial when it comes time to re-doing the other games. Ideas from PR #98 for optimising RRRA vehicle experience while `cl_syncinput 0` is in use have been implemented here.
2020-08-05 07:53:22 +00:00
void checkhardlanding(player_struct* p);
- re-factor interpolation backups into discrete functions for calling from multiple places. Fixes #66.
2020-07-29 22:24:27 +00:00
- functionalise significant portions of 0ee3ab4df8da1a389b6fdb9be664a90e21e869cd.
2020-08-05 09:24:32 +00:00
void playerAddAngle(player_struct* p, int ang);
void playerSetAngle(player_struct* p, int ang);
void playerAddHoriz(player_struct* p, int horiz);
void playerSetHoriz(player_struct* p, int horiz);
- Big cleanup.
2020-07-06 20:23:18 +00:00
END_DUKE_NS
Reference in a new issue Copy permalink