OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
Conflicts:
	src/version.h
This commit is contained in:
Christoph Oelckers 2015-04-03 09:45:04 +02:00
commit f0886ce1f1
21 changed files with 223 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/actor.h
View file

@ -1035,7 +1035,7 @@ public:
virtual bool UpdateWaterLevel (fixed_t oldz, bool splash=true);
bool isFast();
bool isSlow();
void SetIdle();
void SetIdle(bool nofunction=false);
void ClearCounters();
FState *GetRaiseState();
void Revive();