Commit Graph

10 Commits (master)

Author SHA1 Message Date
vexed 6c6fe7c38a Merge branch 'bugfixes'
Conflicts:
	src/e3demo.cpp
	src/e3demo.h
2013-01-16 15:44:22 -05:00
vexed e34e7e4e0c Seems time don't stop, so bump the year to 2013. 2013-01-16 15:34:57 -05:00
Per Inge Mathisen 2d2642d6ef Run astyle over most of the remaining old scripting code. 2012-12-16 21:21:21 +01:00
vexed 3e15039aa6 Unfortunately, the Project can't stop time, so bump the year. 2012-02-11 16:50:52 -05:00
Cyp a4a10cf6ec Fix broken CALL_*_SEEN.
clustObjectSeen() now checks using hasSharedVision(), since clustObjectSeen() is called before DROID::visible is set.

Also, remove the backup of this bug, in scrCBObjectSeen().

Fixes ticket:1855.
2012-01-04 20:11:23 +01:00
abomination a72c41aeec fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
2011-03-13 12:32:24 +01:00
Cyp ae2ce18314 Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
littlepig ec90151d03 Stilling and design improvements over the last commit. 2011-01-20 22:18:00 +00:00
littlepig 75e8001219 Added a std::list<DROID_GROUP *> grpGlobalManager; to replace the 'firstgroup' to avoid every DROID_GROUP object having previous and next DROID_GROUP object to erase all at end shutdown.
DROID_GROUP became class. grpJoin function was made a method of DROID_GROUP, DROID_GROUP::Add(DROID*psDroid) and every instance of grpJoin(DROID_GROUP*, DROID*) was replaced by DROID_GROUP*->Add(DROID). Code was tested both compile and run, and everything is working as supposed, including Initialization and ShutDown of a game.
2011-01-20 22:18:00 +00:00
Cyp 0646b37603 Rename *.c to *.cpp. 2010-12-16 23:28:56 +01:00