Author: muggenhor
Date: Wed Jul 23 16:51:38 2008
New Revision: 5648
URL: http://svn.gna.org/viewcvs/warzone?rev=5648&view=rev
Log:
Revert r5639:
Rolled back revisions r5453:5455, r5459 and r5466 out of the 2.1 branch via
svnmerge from trunk and block them from backporting with svnmerge
Do this because r5639 ''might'' trigger bugs (i.e. not introduce them). Note,
though, that if it would trigger bugs, we would currently be relying on
undefined behaviour in the affected code.
........
r5453 | muggenhor | 2008-07-09 20:28:37 +0200 (wo, 09 jul 2008) | 3 lines
Remove all TECH_LEVEL related cruft from the code as it's read from the stats
files but unused throughout the rest of the code.
Read into a temporary dummy variable when loading stats.
........
r5454 | muggenhor | 2008-07-09 21:02:19 +0200 (wo, 09 jul 2008) | 5 lines
Remove `hitPoints` from the code as it's never used.
It's loaded in from the stats files and copied all over a dozen places, but
never actually __used__.
NOTE: This __shouldn't__ break savegames, I've checked it quite thoroughly,
but game.c is evil & large enough that the chance exists I made a mistake in
this department.
........
r5455 | muggenhor | 2008-07-09 21:07:20 +0200 (wo, 09 jul 2008) | 5 lines
Remove `systemPoints` from the code as it's never used.
It's loaded in from the stats files but unused throughout the rest of the
code.
Read into a temporary dummy variable when loading stats.
........
r5459 | muggenhor | 2008-07-09 22:43:24 +0200 (wo, 09 jul 2008) | 1 line
Fix a compile error; forgot to declare variable "dummyVal" in r5454
........
r5466 | muggenhor | 2008-07-10 17:47:21 +0200 (do, 10 jul 2008) | 2 lines
* Get rid of enumerator INVALID_PROP_TYPE from PROPULSION_TYPE
* Modify getPropulsionType's API so that we don't need to depend on enum
PROPULSION_TYPE containing an "invalid" enumerator
........
Added:
branches/2.1/data/tagdefinitions/savegame/map.def
- copied unchanged from r5638,
branches/2.1/data/tagdefinitions/savegame/map.def
branches/2.1/src/droid.c
- copied unchanged from r5638, branches/2.1/src/droid.c
branches/2.1/src/function.c
- copied unchanged from r5638, branches/2.1/src/function.c
branches/2.1/src/game.c
- copied unchanged from r5638, branches/2.1/src/game.c
branches/2.1/src/map.c
- copied unchanged from r5638, branches/2.1/src/map.c
branches/2.1/src/oprint.c
- copied unchanged from r5638, branches/2.1/src/oprint.c
branches/2.1/src/research.c
- copied unchanged from r5638, branches/2.1/src/research.c
branches/2.1/src/researchdef.h
- copied unchanged from r5638, branches/2.1/src/researchdef.h
branches/2.1/src/stats.c
- copied unchanged from r5638, branches/2.1/src/stats.c
branches/2.1/src/stats.h
- copied unchanged from r5638, branches/2.1/src/stats.h
branches/2.1/src/statsdef.h
- copied unchanged from r5638, branches/2.1/src/statsdef.h
branches/2.1/src/structure.c
- copied unchanged from r5638, branches/2.1/src/structure.c
branches/2.1/src/structuredef.h
- copied unchanged from r5638, branches/2.1/src/structuredef.h
branches/2.1/src/weapondef.h
- copied unchanged from r5638, branches/2.1/src/weapondef.h
Modified:
branches/2.1/ (props changed)
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
