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

252 lines
9.5 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"
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
#include "packet.h"
- migrated EGS and deletesprite to new actor interface. Inline wrappers for old code exist. The backupplayer inline was moved into player.cpp because that's the only place it gets used.
2020-10-21 17:14:41 +00:00
#include "types.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
- migrated EGS and deletesprite to new actor interface. Inline wrappers for old code exist. The backupplayer inline was moved into player.cpp because that's the only place it gets used.
2020-10-21 17:14:41 +00:00
- Big cleanup.
2020-07-06 20:23:18 +00:00
// 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();
- transitioned cloudclock. This timer runs at 60 Hz in the render code, so it needs to take smoothratio into account.
2020-08-31 17:22:21 +00:00
void moveclouds(double smoothratio);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
- migrated EGS and deletesprite to new actor interface. Inline wrappers for old code exist. The backupplayer inline was moved into player.cpp because that's the only place it gets used.
2020-10-21 17:14:41 +00:00
void RANDOMSCRAP(DDukeActor* i);
- ms function.
2020-10-24 08:04:10 +00:00
void ms(DDukeActor* i);
- movecrane interface cleanup.
2020-10-24 08:37:20 +00:00
void movecrane(DDukeActor* i, int crane);
- movefountain and moveflammable. # Conflicts: # source/games/duke/src/actors.cpp
2020-10-21 19:46:39 +00:00
void movefountain(DDukeActor* i, int fountain);
void moveflammable(DDukeActor* i, int tire, int box, int pool);
- detonate and movemasterswitch. # Conflicts: # source/games/duke/src/actors.cpp
2020-10-21 19:57:18 +00:00
void detonate(DDukeActor* i, int explosion);
void movemasterswitch(DDukeActor* i, int spectype1, int spectype2);
- 3 smaller functions.
2020-10-21 20:17:25 +00:00
void movetrash(DDukeActor* i);
void movewaterdrip(DDukeActor* i, int drip);
void movedoorshock(DDukeActor* i);
- movetouchplate, moveooz, movecanwithsomething. # Conflicts: # source/games/duke/src/funct.h
2020-10-21 20:22:12 +00:00
void movetouchplate(DDukeActor* i, int plate);
void movecanwithsomething(DDukeActor* i);
- bounce, movetongue and rpgexplode.
2020-10-21 20:29:35 +00:00
void bounce(DDukeActor* i);
void movetongue(DDukeActor* i, int tongue, int jaw);
void rpgexplode(DDukeActor* i, int j, const vec3_t& pos, int EXPLOSION2, int EXPLOSIONBOT2, int newextra, int playsound);
- movetouchplate, moveooz, movecanwithsomething. # Conflicts: # source/games/duke/src/funct.h
2020-10-21 20:22:12 +00:00
void moveooz(DDukeActor* i, int seenine, int seeninedead, int ooz, int explosion);
- pass spawner as an actor pointer to 'lotsofstuff'. Allows doing this without using sprite indices.
2020-10-24 07:35:43 +00:00
void lotsofstuff(DDukeActor* s, int n, int spawntype);
- respawnmarker, rat and queball.
2020-10-21 20:34:45 +00:00
bool respawnmarker(DDukeActor* i, int yellow, int green);
bool rat(DDukeActor* i, bool makesound);
bool queball(DDukeActor* i, int pocket, int queball, int stripeball);
- forcesphere and recon.
2020-10-21 20:59:56 +00:00
void forcesphere(DDukeActor* i, int forcesphere);
void recon(DDukeActor* i, int explosion, int firelaser, int attacksnd, int painsnd, int roamsnd, int shift, int (*getspawn)(DDukeActor* i));
- ooz, reactor and camera.
2020-10-21 21:04:14 +00:00
void ooz(DDukeActor* i);
void reactor(DDukeActor* i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BURNT, int REACTORSPARK, int REACTOR2SPARK);
void camera(DDukeActor* i);
- forcesphere, watersplash2, frameeffect and money.
2020-10-21 21:11:06 +00:00
void forcesphereexplode(DDukeActor* i);
void watersplash2(DDukeActor* i);
void frameeffect1(DDukeActor* i);
bool money(DDukeActor* i, int BLOODPOOL);
- jibs, bloodpool, shell, glasspieces and scrap.
2020-10-21 21:18:24 +00:00
bool jibs(DDukeActor* i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, bool zcheck1, bool zcheck2);
bool bloodpool(DDukeActor* i, bool puke, int TIRE);
void shell(DDukeActor* i, bool morecheck);
void glasspieces(DDukeActor* i);
void scrap(DDukeActor* i, int SCRAP1, int SCRAP6);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
- SE 0 and 1 handlers.
2020-10-21 21:39:12 +00:00
void handle_se00(DDukeActor* i, int LASERLINE);
void handle_se01(DDukeActor* i);
- handle_SE14 function signature and recordoldspritepos
2020-10-21 21:56:46 +00:00
void handle_se14(DDukeActor* i, bool checkstat, int RPG, int JIBS6);
- handle_se30.
2020-10-21 22:00:43 +00:00
void handle_se30(DDukeActor* i, int JIBS6);
- handle SE02-SE04.
2020-10-21 22:10:43 +00:00
void handle_se02(DDukeActor* i);
void handle_se03(DDukeActor* i);
void handle_se04(DDukeActor* i);
- handle_se05, 08, 10.
2020-10-21 22:14:54 +00:00
void handle_se05(DDukeActor* i, int FIRELASER);
void handle_se08(DDukeActor* i, bool checkhitag1);
void handle_se10(DDukeActor* i, const int *);
- handle_se11-13.
2020-10-21 22:20:47 +00:00
void handle_se11(DDukeActor* i);
void handle_se12(DDukeActor* i, int planeonly = 0);
void handle_se13(DDukeActor* i);
- handle_se15-17.
2020-10-21 22:25:11 +00:00
void handle_se15(DDukeActor* i);
void handle_se16(DDukeActor* i, int REACTOR, int REACTOR2);
void handle_se17(DDukeActor* i);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
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);
- actor iterators for movefx and its RRRA subfunction.
2020-10-24 08:30:17 +00:00
void respawn_rrra(DDukeActor* oldact, DDukeActor* newact);
- renamed a few headers.
2020-06-24 19:21:02 +00:00
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);
- migrated EGS and deletesprite to new actor interface. Inline wrappers for old code exist. The backupplayer inline was moved into player.cpp because that's the only place it gets used.
2020-10-21 17:14:41 +00:00
void deletesprite(DDukeActor* 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
- clearcamera and ssp.
2020-10-21 17:38:53 +00:00
int ssp(DDukeActor* i, unsigned int cliptype); //The set sprite function
- changed the spriteq to use pointers instead of indices.
2020-10-24 07:40:10 +00:00
void insertspriteq(DDukeActor *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);
- InputPacket: Change `q16avel` to `avel`, changing type from fixed_t to float.
2020-10-08 03:47:30 +00:00
void processavel(player_struct* p, float* avel);
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
void checklook(int snum, ESyncBits actions);
- Big cleanup.
2020-07-06 20:23:18 +00:00
void playerCenterView(int snum);
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
void playerLookUp(int snum, ESyncBits actions);
void playerLookDown(int snum, ESyncBits actions);
void playerAimUp(int snum, ESyncBits actions);
void playerAimDown(int snum, ESyncBits actions);
- Blood/Duke/SW: Smooth out player's zpos adjustment while in 3rd person view.
2020-09-23 13:12:59 +00:00
bool view(struct player_struct* pp, int* vx, int* vy, int* vz, short* vsectnum, int ang, fixed_t q16horiz, double smoothratio);
- Big cleanup.
2020-07-06 20:23:18 +00:00
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);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
void shootbloodsplat(int i, int p, int sx, int sy, int sz, int sa, int atwith, int BIGFORCE, int OOZFILTER, int NEWBEAST);
- Big cleanup.
2020-07-06 20:23:18 +00:00
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);
- SE14 part 2
2020-11-01 06:56:49 +00:00
DDukeActor* LocateTheLocator(int n, int 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
- added the remaining CON features from EDuke 2.x Not everything will do something, though. This was some incredibly careless code operating without a safety net allowing uncontrolled write access to the map structure. Most of the critical fields have been made read-only, which has been the only mode of access in the mods I checked. Note that this does not enable scripting of the weapon sprite drawer, only the gameplay related features were done.
2020-09-17 20:36:09 +00:00
void LoadActor(int i, int p, int x);
- 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);
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 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 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);
- WIP level transition refactored to a game independent event system.
2020-09-03 21:10:28 +00:00
void dobonus_d(int bonusonly, const CompletionFunc& completion);
void dobonus_r(int bonusonly, const CompletionFunc& completion);
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
- cleaned up Duke's main GameTicker function. * moved the part that alters the input before queuing it to GetInput * moved moveloop into the main function * reshuffled a few things for better grouping by task.
2020-08-29 19:20:10 +00:00
void drawoverlays(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);
- Duke: Make a bit more use of the calculated smooth ratio.
2020-08-25 10:04:29 +00:00
void displayrooms(int32_t playerNum, double smoothratio);
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 02:54:12 +00:00
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);
- WIP level transition refactored to a game independent event system.
2020-09-03 21:10:28 +00:00
void exitlevel(MapRecord *next);
- set up the loadscreen code. This isn't active, though, because load times are so short these days that all this results in is an irritating screen flash before the level starts. It may be activated later when hires assets are in use. Fixes #10 (or not...? ;) )
2020-09-09 20:42:01 +00:00
void 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);
- added back the player sprites in Duke/RR's player setup menu. Fixes #46
2020-08-23 18:44:17 +00:00
int playercolor2lookup(int color);
- cleanup on pausing code.
2020-07-15 16:10:31 +00:00
void PlayerColorChanged(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);
- 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);
- 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();
- interpolation fix from EDuke: "Patch from Striker to improve sprite interpolation" Fixes #109
2020-09-11 20:54:52 +00:00
void recordoldspritepos();
- 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);
- 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);
- 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);
- 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);
- fix `cl_weaponsway` for Duke.
2020-08-05 10:04:14 +00:00
void playerweaponsway(player_struct* p, spritetype* s);
- re-factor interpolation backups into discrete functions for calling from multiple places. Fixes #66.
2020-07-29 22:24:27 +00:00
- Big cleanup.
2020-07-06 20:23:18 +00:00
END_DUKE_NS
Reference in a new issue Copy permalink