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

132 lines
4.7 KiB
C
Raw Normal View History

- Duke: got rid of the last 3 remaining #defines not used for list generation, as well.
2020-10-11 09:41:49 +00:00
#pragma once
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
#include "build.h"
#include "gamecvars.h"
- it compiles again (with lots of code commented out.)
2020-10-04 16:31:48 +00:00
#include "razemenu.h"
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
#include "gamecontrol.h"
- fixed include
2020-06-21 21:07:30 +00:00
#include "gamevar.h"
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
#include "global.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 "funct.h"
- got rid of the dynamic tilemap. Most tile access is in game specific code, the remaining code only accesses 51 tiles
2020-07-03 21:56:14 +00:00
#include "names.h"
- constant cleanup.
2020-07-06 11:26:26 +00:00
#include "quotemgr.h"
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
#include "rts.h"
#include "sounds.h"
- removed sooundsdyn - this isn't needed because no sounds get remapped.
2020-06-21 22:40:05 +00:00
#include "soundefs.h"
- it compiles again (with lots of code commented out.)
2020-10-04 16:31:48 +00:00
#include "gamestruct.h"
#include "v_draw.h"
- some leftover shorts plus utilities that ended up unused but may be useful later.
2021-11-07 15:46:23 +00:00
#include "gamefuncs.h"
-more header work.
2020-07-06 16:08:31 +00:00
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
BEGIN_DUKE_NS
- major cleanup and consolidation of the screen/hud resizing code. This is now being handled by the backend, except for the processing of the key bindings which cannot be done yet.
2020-08-16 00:55:50 +00:00
struct GameInterface : public ::GameInterface
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
{
- fixed menu registration.
2020-07-01 23:24:46 +00:00
const char* Name() override { return "Duke"; }
- restructured the main loop code so that the actual loop is in the common code.
2020-08-23 15:47:05 +00:00
void app_init() override;
- reorganized loading of textures. Due to dependencies on initializing some data in app_init it was not possible to cleanly set up the fonts. This adds a game-side function for loading the entire palettes before starting with the texture data and another one for loading game-side texture data. This now allows fully setting up the palettes before starting with the textures and to fully set up the textures before reading the .def files. All this is needed because to properly initialize, the fonts need to be able to access the fully initialized texture state, including replacements and hires substitutions from the .def files.
2021-06-01 09:05:26 +00:00
void loadPalette();
- use CCMDs for weapon and inventory selection, courtesy of ZDuke.
2020-07-17 18:56:10 +00:00
void clearlocalinputstate() override;
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
bool GenerateSavePic() override;
- 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 PlayHudSound() override;
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
GameStats getStats() override;
void MenuOpened() override;
void MenuSound(EMenuSounds snd) override;
bool CanSave() override;
- added shareware checks to the "start game" menus.
2020-09-25 17:36:50 +00:00
bool StartGame(FNewGameStartup& gs) override;
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
FSavegameInfo GetSaveSig() override;
- the menu code is clean.
2020-07-02 08:59:22 +00:00
double SmallFontScale() override { return isRR() ? 0.5 : 1.; }
- hooked up the new savegame code. Not tested yet.
2020-07-20 22:07:02 +00:00
void SerializeGameState(FSerializer& arc) override;
- refactored coordinate display to have a single unified printing function. The games will now only return the data, this has also been added for Exhumed. Printing will now be in actual map units, not build's internal mixed format.
2022-08-21 22:08:52 +00:00
std::pair<DVector3, DAngle> GetCoordinates() override;
- properly route gameexitfrommenu through the callbacks.
2020-07-18 19:28:57 +00:00
void ExitFromMenu() override;
- major cleanup and consolidation of the screen/hud resizing code. This is now being handled by the backend, except for the processing of the key bindings which cannot be done yet.
2020-08-16 00:55:50 +00:00
ReservedSpace GetReservedScreenSpace(int viewsize) override;
- use global variables to track automap state So far implemented in Duke/RR.
2020-08-24 17:31:43 +00:00
void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
- Move `InputScale()` out of inputstate.cpp and into `i_time.cpp` as `I_GetInputFrac()` to make it available to GZDoom for potential future requirements. * As part of this, feed the output of `I_GetInputFrac()` to `gi->GetInput()` instead of having each game's virtual override calling it locally.
2021-11-12 07:59:52 +00:00
void GetInput(ControlInfo* const hidInput, double const scaleAdjust, InputPacket* packet = nullptr) override;
- continued work on main loop - added a few new entry points to the game interface.
2020-08-29 22:55:49 +00:00
void UpdateSounds() override;
- more work to switch over to the new loop. Mainly separation of ticker and render calls
2020-08-30 08:42:44 +00:00
void Startup() override;
void DrawBackground() override;
void Render() override;
void Ticker() override;
- implemented the 'god' cheat as a network command. This was mainly chosen as something simple to get the basics set up.
2020-09-02 22:29:17 +00:00
const char* GenericCheat(int player, int cheat) override;
- WIP level transition refactored to a game independent event system.
2020-09-03 21:10:28 +00:00
const char* CheckCheatMode() override;
void NextLevel(MapRecord* map, int skill) override;
- Exhumed: Change map command to start the level directly without going through the scrolling map.
2021-04-15 16:50:48 +00:00
void NewGame(MapRecord* map, int skill, bool) override;
- WIP level transition refactored to a game independent event system.
2020-09-03 21:10:28 +00:00
void LevelCompleted(MapRecord* map, int skill) override;
- Floatify `smoothratio` for `DrawOverheadMap()`.
2022-09-07 09:37:50 +00:00
bool DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const interpfrac) override;
- Remove horizon from `gi->WarpToCoords()` since we don't even print the horizon in our stats.
2022-09-27 03:10:22 +00:00
void WarpToCoords(double x, double y, double z, DAngle ang) override;
- route the shared control CCMDs through the game interface instead of registering local variants for each game.
2020-11-29 11:23:31 +00:00
void ToggleThirdPerson() override;
void SwitchCoopView() override;
void ToggleShowWeapon() override;
- pass a vector to the processSprites interface.
2022-09-16 17:20:35 +00:00
void processSprites(tspriteArray& tsprites, const DVector3& view, DAngle viewang, double interpfrac) override;
- fixed camera texture setup. They still are upside-down but aside from that work as expected.
2021-03-28 17:22:51 +00:00
void UpdateCameras(double smoothratio) override;
- use actors instead of sprites in the new renderer's API.
2021-12-22 22:27:32 +00:00
void EnterPortal(DCoreActor* viewer, int type) override;
void LeavePortal(DCoreActor* viewer, int type) override;
- sector[] in render interface
2021-11-18 18:33:32 +00:00
bool GetGeoEffect(GeoEffect* eff, sectortype* viewsector) override;
- `gi->AddExcludedEpisode()`: Pass FString variable through as reference instead of by value.
2021-11-14 21:56:49 +00:00
void AddExcludedEpisode(const FString& episode) override;
- Add `skill` CCMD to return player's current skill, while also being able to set skill for next game. * Fixes #332.
2021-07-20 08:50:46 +00:00
int GetCurrentSkill() override;
- Duke: fixed long standing problem that pressing Escape or walking backwards does not switch off the camera view.
2022-11-19 17:26:17 +00:00
bool WantEscape() override;
- use global variables to track automap state So far implemented in Duke/RR.
2020-08-24 17:31:43 +00:00
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
};
-more header work.
2020-07-06 16:08:31 +00:00
struct Dispatcher
{
// sectors_?.cpp
- properly tabified everything.
2020-07-20 21:21:27 +00:00
void (*think)();
- Duke: Call `movetransports()` before processing any player movement. * This simply works much better. In addition to being able to revert commits like `- Duke: Maintain x/y/z velocity when falling through a portal, such as E1L1's air duct.`, transitioning from above water to underwater and vice-versa is interpolated, smooth and seamless, something that I was unable to hack in without this change.
2022-10-11 01:16:59 +00:00
void (*movetransports)();
-more header work.
2020-07-06 16:08:31 +00:00
void (*initactorflags)();
bool (*isadoorwall)(int dapic);
void (*animatewalls)();
- fixed a few bad parameters.
2020-11-02 18:54:20 +00:00
void (*operateforcefields)(DDukeActor* act, int low);
- use pointers for checkhitswitch and took separated clearcameras to a new functions to make this free of gotos.
2021-11-17 23:16:53 +00:00
bool (*checkhitswitch)(int snum, walltype* w, DDukeActor* act);
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
void (*activatebysector)(sectortype* sect, DDukeActor* j);
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
void (*checkhitwall)(DDukeActor* spr, walltype* dawall, const DVector3& pos, int atwith);
- checkhitceiling + ceilingglass are sector[] free.
2021-11-18 16:55:08 +00:00
bool (*checkhitceiling)(sectortype* sn);
- switched the checkhitsprite interface to actors.
2020-10-24 05:15:10 +00:00
void (*checkhitsprite)(DDukeActor* i, DDukeActor* sn);
- scriptified OozFilter + Seenine Also fixing the default handling for onHit.
2022-01-20 07:31:08 +00:00
void (*checkhitdefault)(DDukeActor* i, DDukeActor* sn);
-more header work.
2020-07-06 16:08:31 +00:00
void (*checksectors)(int low);
- Duke: replaced DukeLinearSpriteIterator and explicit loops over the sprite[] array.
2021-12-04 12:02:38 +00:00
DDukeActor* (*spawninit)(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>* actors);
-more header work.
2020-07-06 16:08:31 +00:00
- pass a sector pointer to floorspace/ceilingspace.
2021-11-06 21:57:26 +00:00
bool (*ceilingspace)(sectortype* sectp);
bool (*floorspace)(sectortype* sectp);
- implemented cl_weaponswitch for Duke.
2022-11-12 08:33:33 +00:00
void (*addweapon)(player_struct *p, int weapon, bool wswitch);
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
void (*hitradius)(DDukeActor* i, int r, int hp1, int hp2, int hp3, int hp4);
- Duke: eliminated all local short variables in actors*.cpp.
2021-11-07 13:07:08 +00:00
void (*lotsofmoney)(DDukeActor *s, int n);
void (*lotsofmail)(DDukeActor *s, int n);
void (*lotsofpaper)(DDukeActor *s, int n);
void (*guts)(DDukeActor* s, int gtype, int n, int p);
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
int (*ifhitbyweapon)(DDukeActor* sectnum);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
void (*fall)(DDukeActor* actor, int g_p);
- scriptified the scraps. A Duke-ish mess of epic proportions.
2022-11-14 22:55:46 +00:00
bool (*spawnweapondebris)(int picnum);
- the last remaining small functions in actors_d.cpp and actors_r.cpp.
2020-10-22 21:45:49 +00:00
void (*respawnhitag)(DDukeActor* g_sp);
void (*move)(DDukeActor* i, int g_p, int g_x);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
// player
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void (*incur_damage)(player_struct* p);
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
void (*shoot)(DDukeActor*, int);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
void (*selectweapon)(int snum, int j);
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
int (*doincrements)(player_struct* p);
void (*checkweapons)(player_struct* p);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
void (*processinput)(int snum);
- Eliminate `__interpvaluef()` and clean up Q16.16 smoothratio values where it made sense to do so.
2022-09-07 05:34:55 +00:00
void (*displayweapon)(int snum, double interpfrac);
void (*displaymasks)(int snum, int p, double interpfrac);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
- refactor animatesprites API
2022-09-15 17:06:41 +00:00
void (*animatesprites)(tspriteArray& tsprites, const DVector2& viewVec, DAngle viewang, double interpfrac);
-more header work.
2020-07-06 16:08:31 +00:00
};
extern Dispatcher fi;
- added script exports for Duke's main structures.
2022-02-20 23:19:26 +00:00
void CallInitialize(DDukeActor* actor);
void CallTick(DDukeActor* actor);
- scriptified viewscreen and camera.
2022-01-21 00:04:08 +00:00
bool CallOperate(DDukeActor* actor, int plnum);
- added script exports for Duke's main structures.
2022-02-20 23:19:26 +00:00
void CallAction(DDukeActor* actor);
- added CallOnHit and named spawn.
2022-01-17 23:30:43 +00:00
void CallOnHit(DDukeActor* actor, DDukeActor* hitter);
- refactored Duke's cactus.
2022-11-15 09:17:23 +00:00
void CallOnHurt(DDukeActor* actor, player_struct* hitter);
- scriptified viewscreen and camera.
2022-01-21 00:04:08 +00:00
bool CallOnUse(DDukeActor* actor, player_struct* user);
- scriptified the respawn controller. This also handles one special RRRA controller which was just easier to scriptify right away than temporarily work around it.
2022-11-20 10:58:19 +00:00
void CallOnRespawn(DDukeActor* actor, int low);
- CallOnanimate
2022-01-19 17:52:52 +00:00
bool CallAnimate(DDukeActor* actor, tspritetype* hitter);
- scriptified the remaining controller sprites.
2022-11-20 12:57:51 +00:00
void CallStaticSetup(DDukeActor* actor);
- added script exports for Duke's main structures.
2022-02-20 23:19:26 +00:00
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
END_DUKE_NS
Reference in a new issue Copy permalink