hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-17 17:00:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection

Browse Source 
# Conflicts, ignored these upstream changes:
#	REDALERT/MiscAsm.cpp
#	REDALERT/WIN32LIB/DrawMisc.cpp
This commit is contained in:
Justin Marshall
2020-06-22 17:19:05 -07:00
parent f53249cb24 cd8bc9228e
commit 21f30aad44
68 changed files with 1189 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/REDALERT/ANIM.H
+3 -2
View File
@@ -51,7 +51,7 @@ class AnimClass : public ObjectClass, public StageClass {
public:
AnimClass(AnimType animnum, COORDINATE coord, unsigned char timedelay=0, unsigned char loop=1);
AnimClass(AnimType animnum, COORDINATE coord, unsigned char timedelay=0, char loop=1);
AnimClass(NoInitClass const & x) : ObjectClass(x), Class(x), StageClass(x) {};
virtual ~AnimClass(void);
@@ -79,6 +79,7 @@ class AnimClass : public ObjectClass, public StageClass {
void Set_Visible_Flags(unsigned flags) { VisibleFlags = flags; }
unsigned Get_Visible_Flags() const { return (Delay == 0) ? VisibleFlags : 0; }
virtual HousesType Owner(void) const {return OwnerHouse;};
virtual bool Can_Place_Here(COORDINATE ) const {return true;}
virtual bool Mark(MarkType mark=MARK_CHANGE);
virtual bool Render(bool forced) const;
@@ -121,7 +122,7 @@ class AnimClass : public ObjectClass, public StageClass {
** This counter tells how many more times the animation should loop before it
** terminates.
*/
unsigned char Loops;
char Loops;
protected:
void Middle(void);