zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 14:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Randy Heit 2013-10-09 22:33:58 -05:00
commit d76dbcaa9d
5 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/c_dispatch.cpp
View file

@ -626,10 +626,17 @@ void C_DoCommand (const char *cmd, int keynum)
com->Run (args, players[consoleplayer].mo, keynum); com->Run (args, players[consoleplayer].mo, keynum);
} }
else else
{
if (len == 4 && strnicmp(beg, "warp", 4) == 0)
{
StoredWarp = beg;
}
else
{ {
new DStoredCommand (com, beg); new DStoredCommand (com, beg);
} }
} }
}
else else
{ // Check for any console vars that match the command { // Check for any console vars that match the command
FBaseCVar *var = FindCVarSub (beg, int(len)); FBaseCVar *var = FindCVarSub (beg, int(len));

8
src/d_main.cpp
View file

@ -218,6 +218,7 @@ int NoWipe; // [RH] Allow wipe? (Needs to be set each time)
bool singletics = false; // debug flag to cancel adaptiveness bool singletics = false; // debug flag to cancel adaptiveness
FString startmap; FString startmap;
bool autostart; bool autostart;
FString StoredWarp;
bool advancedemo; bool advancedemo;
FILE *debugfile; FILE *debugfile;
event_t events[MAXEVENTS]; event_t events[MAXEVENTS];
@ -2081,7 +2082,7 @@ static void CheckCmdLine()
{ {
startmap = "&wt@01"; startmap = "&wt@01";
} }
autostart = false; autostart = StoredWarp.IsNotEmpty();
const char *val = Args->CheckValue ("-skill"); const char *val = Args->CheckValue ("-skill");
if (val) if (val)
@ -2518,6 +2519,11 @@ void D_DoomMain (void)
if (demorecording) if (demorecording)
G_BeginRecording (startmap); G_BeginRecording (startmap);
G_InitNew (startmap, false); G_InitNew (startmap, false);
if (StoredWarp.IsNotEmpty())
{
AddCommandString(StoredWarp.LockBuffer());
StoredWarp = NULL;
}
} }
else else
{ {

2
src/doomstat.h
View file

@ -59,6 +59,8 @@ extern FString startmap; // [RH] Actual map name now
extern bool autostart; extern bool autostart;
extern FString StoredWarp; // [RH] +warp at the command line
// Selected by user. // Selected by user.
EXTERN_CVAR (Int, gameskill); EXTERN_CVAR (Int, gameskill);
extern int NextSkill; // [RH] Skill to use at next level load extern int NextSkill; // [RH] Skill to use at next level load

4
src/g_hexen/a_fighterquietus.cpp
View file

@ -58,12 +58,12 @@ class AFSwordMissile : public AActor
{ {
DECLARE_CLASS (AFSwordMissile, AActor) DECLARE_CLASS (AFSwordMissile, AActor)
public: public:
int DoSpecialDamage(AActor *victim, AActor *source, int damage, FName damagetype); int DoSpecialDamage(AActor *victim, int damage, FName damagetype);
}; };
IMPLEMENT_CLASS (AFSwordMissile) IMPLEMENT_CLASS (AFSwordMissile)
int AFSwordMissile::DoSpecialDamage(AActor *victim, AActor *source, int damage, FName damagetype) int AFSwordMissile::DoSpecialDamage(AActor *victim, int damage, FName damagetype)
{ {
if (victim->player) if (victim->player)
{ {

11
src/textures/animations.cpp
View file

@ -659,6 +659,17 @@ void FTextureManager::ParseCameraTexture(FScanner &sc)
sc.UnGet (); sc.UnGet ();
} }
} }
if (sc.GetString())
{
if (sc.Compare("WorldPanning"))
{
viewer->bWorldPanning = true;
}
else
{
sc.UnGet();
}
}
viewer->SetScaledSize(fitwidth, fitheight); viewer->SetScaledSize(fitwidth, fitheight);
} }