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

125 lines
4.5 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 "polymost.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;
- preparation work. # Conflicts: # source/core/gamecontrol.cpp
2020-06-11 07:22:16 +00:00
FString GetCoordString() 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;
- fixed automap player drawing for follpw mode off in all games.
2021-11-26 22:11:59 +00:00
bool DrawAutomapPlayer(int mx, int my, int x, int y, int z, int a, double const smoothratio) override;
- All Games: Unify `processMovement()`.
2020-09-24 12:32:37 +00:00
int playerKeyMove() override { return 40; }
- 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 WarpToCoords(int x, int y, int z, int a, int h) override;
void ToggleThirdPerson() override;
void SwitchCoopView() override;
void ToggleShowWeapon() override;
- calcChaseCamPos(): Restore original algorithms for new position via GameInterface struct. * Averaging out the values was a net negative for all games. Each games' original value is tuned to the specific games.
2021-02-16 10:48:59 +00:00
int chaseCamX(binangle ang) { return -ang.bcos(-4); }
int chaseCamY(binangle ang) { return -ang.bsin(-4); }
int chaseCamZ(fixedhoriz horiz) { return horiz.asq16() >> 9; }
- refactored the owner index in tspritetype. This is now a separate type from spritetype which contains an actor pointer instead so that sprite display can be handled without requiring a static sprite array.
2021-12-04 18:08:50 +00:00
void processSprites(tspritetype* tsprite, int& spritesortcnt, int viewx, int viewy, int viewz, binangle viewang, double smoothRatio) 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;
- fixed display of player in mirrors.
2021-03-29 19:48:23 +00:00
void EnterPortal(spritetype* viewer, int type) override;
void LeavePortal(spritetype* 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;
- 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)();
-more header work.
2020-07-06 16:08:31 +00:00
void (*initactorflags)();
bool (*isadoorwall)(int dapic);
void (*animatewalls)();
void (*operaterespawns)(int low);
- 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);
- change wall parameter of checkhitwall.
2021-11-17 22:49:49 +00:00
void (*checkhitwall)(DDukeActor* spr, walltype* dawall, int x, int y, int z, 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);
-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);
-more header work.
2020-07-06 16:08:31 +00:00
void (*addweapon)(struct player_struct *p, int weapon);
- 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);
- sectnum removal step
2021-11-21 08:05:58 +00:00
DDukeActor* (*ifhitsectors)(sectortype* sectnum);
- 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);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
bool (*spawnweapondebris)(int picnum, int dnum);
- 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);
- 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 (*checktimetosleep)(DDukeActor* actor);
- the last remaining small functions in actors_d.cpp and actors_r.cpp.
2020-10-22 21:45:49 +00:00
void (*move)(DDukeActor* i, int g_p, int g_x);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
// player
void (*incur_damage)(struct 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);
int (*doincrements)(struct player_struct* p);
void (*checkweapons)(struct player_struct* p);
void (*processinput)(int snum);
- pass `smoothratio` through to `displayweapon()`.
2020-08-02 03:43:45 +00:00
void (*displayweapon)(int snum, double smoothratio);
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
void (*displaymasks)(int snum, int p, double smoothratio);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
- refactored the owner index in tspritetype. This is now a separate type from spritetype which contains an actor pointer instead so that sprite display can be handled without requiring a static sprite array.
2021-12-04 18:08:50 +00:00
void (*animatesprites)(tspritetype* tsprite, int& spritesortcnt, int x, int y, int a, int smoothratio);
-more header work.
2020-07-06 16:08:31 +00:00
};
extern Dispatcher fi;
- 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