Commit Graph

3773 Commits (09e0e482908af711207f6c05ffe4cc1eea33931b)
 

Author SHA1 Message Date
Tobias Zwick 07fbe84af6 fix docs header 2012-02-01 20:10:17 +01:00
Armin Burgmeier de4a93cfc5 win32: Actually use the new delay when the timer delay is updated
Instead of just re-creating the timer with the old value. This fixes using
/speed to make the game faster than the default.
2012-02-12 15:54:36 +01:00
Armin Burgmeier 70a67204cb win32: Scheduler runs timeouted procs also when flooded by event inputs (#256) 2012-02-12 15:15:03 +01:00
Nicolas Hake 08d71bcd74 Drop PIF_HasRes flag from player info read from replays
C4PlayerInfo stores the PIF_HasRes flag for savegames and network synch. The
resource system isn't used in replays however, so the flag is wrong there. Clear
it when loading a replay, so a later assertion in the cleanup code doesn't fail.
2012-02-12 14:01:12 +01:00
Armin Burgmeier f349a97919 Correctly honor game speed if delay is below MaxRefreshDelay (#260) 2012-02-12 13:49:02 +01:00
Armin Burgmeier 06dc47cb09 Make sure sector list order always matches main list order
So actually be29346165d6 turned out to be an incorrect fix. The actual
problem is much more subtle: the ordering of objects within the same
plane by their ID could cause the sector list order to not match the
main list order anymore. This has been fixed by re-arranging the code in
question.

I hope this really fixes #711.
2012-02-12 04:26:33 +01:00
Armin Burgmeier b16fc0ccf3 Ignore Status==0 objects in C4ObjectList::CheckSort 2012-02-12 04:21:42 +01:00
Armin Burgmeier 612f14016e Also check order of last list entry in C4ObjectList::CheckCategorySort 2012-02-12 04:21:18 +01:00
David Dormagen 5749053687 docs updated for the DrawMap/DrawDefMap change 2012-02-11 23:25:37 +01:00
David Dormagen b359373f5d clearing of landscape is now done in C4Landscape::MapToLandscape instead of MapToSurface 2012-02-11 23:24:53 +01:00
David Dormagen 2a53b55a45 added parameter for DrawMap and DrawDefMap to retain old material if sky is drawn 2012-02-10 21:48:48 +01:00
Armin Burgmeier cd8becb577 Remove executable bits of non-executable files 2012-02-10 01:18:15 +01:00
Felix Wagner a1ab572fe4 New wheat graphic from Nachtfalter 2012-02-09 01:29:50 +00:00
Günther Brammer 286a32f47d Remove C4GroupEntryCore::(Has)CRC, calculate the CRC on demand
The CRC was basically only used to decide which files to include in update
groups, but calculated for every group and then stored in the file on disc.
And for some unknown reason, updates themself didn't produce the right
numbers in the file.

This means that c4groups with this change cannot reproduce groups written
by older c4groups and vice versa, but this isn't necessary for updates, and
reading is compatible both ways.

Except for the ways that C4Update fails to remove the CRCs.
2012-02-08 00:12:44 +01:00
Felix Wagner 3211605f40 Tweaks for the lift tower. 2012-02-08 01:28:22 +00:00
Günther Brammer 4fb3007690 win32: Fix out-of-tree setup build 2012-02-05 21:43:55 +01:00
Armin Burgmeier 2092baaa18 Fix possible double close when attempting to open uncompressed files 2012-02-05 20:00:47 +01:00
Armin Burgmeier fb27b9c1c3 Reset Unsorted flag only after sorting has been fully finished
This not only seems more correct but might also fix #711
2012-02-05 17:28:55 +01:00
Nicolas Hake fd4540d573 cmake: Read Mercurial revision from .hg_archival.txt if available
This way cmake will generate a correct C4Version.h from source tarballs
generated by hg archive.
2012-02-05 02:08:45 +01:00
Felix Wagner 32028fd903 Fixed elevator picture 2012-02-04 23:17:02 +00:00
Armin Burgmeier f50ebf6441 Update C4Group packing order
This speeds up loading of packed files significantly. It's not optimal,
though, because the order in which textures are loaded by the engine
is not known by c4group (it depends on their occurence in the Scene.material
file). This could be fixed by specifying custom packing orders for every
object we have. But then again maybe switching to a different format which
allows for random access might be more worth it.
2012-02-04 22:08:38 +01:00
Armin Burgmeier 8e5b9262df Fix a possible file leak in CStdFile::Open
This happened if open() worked but c4_gzdopen failed. This bug prevented
Objects.ocd being packed because of "Too many files open."
2012-02-04 21:28:17 +01:00
Maikel de Vries 121f3092b2 Add lorry for real to GoldRush and IronPeak 2012-02-04 18:19:13 +01:00
David Dormagen e5746dd407 Sprout Berries should look less like plastic 2012-02-04 15:03:39 +01:00
Armin Burgmeier 139184c540 Set system data path to exepath for binaries with automatic updates
Updates work only when the game data is at the same location as the binary.
If this is not the case then the game was probably installed differently,
for example via the distribution or with make install. In this case we
cannot do automatic updates but we also want to use a different system path.

This fixes the linux development snapshots and release tarballs. They were
broken in the sense that they didn't find their game data.
2012-02-03 23:43:18 +01:00
Armin Burgmeier 6da98a26b5 Generate packed groups only at make install or make setup
But not for regular make when just compiling the source code.
2012-02-03 22:22:25 +01:00
Felix Wagner d73eeb454c Added lorry to GoldRush 2012-02-03 18:45:12 +00:00
Nicolas Hake f3ae992f33 Fix dangling pointer on temporary pack of player file on join (#706)
I hate StdStrBuf. It's just close enough to any sane string class that you think
it does reasonable things, then when you don't look it will turn around and stab
you in the back with a rusty fork.
2012-02-03 14:36:17 +01:00
Günther Brammer 7d0866ffab docs: Use javascript to avoid page reloads when using the toc
This uses the fairly new history.pushState API, but simply falls back on
normal navigation in browsers that don't support that.
2012-01-11 17:50:23 +01:00
Günther Brammer b980007c25 win32: Add a firewall exception on installation 2011-10-30 16:17:40 +01:00
Günther Brammer d8218120fc win32: Every install location gets it's own uninstall entry 2011-11-01 20:46:48 +01:00
Günther Brammer 6394f209a5 win32: Installer uses a per-installation game explorer guid 2011-11-01 20:37:58 +01:00
Günther Brammer fea377f196 win32: Fill in Games Explorer XML data from Version.txt 2011-10-31 01:31:56 +01:00
Günther Brammer d995490137 win32: register with the Game Explorer 2011-10-30 16:16:14 +01:00
Sven Eberhardt 95582747db Fix random team distribution when a player leaves during lobby time
Also allow random/random surprise teams in AutoGenerateTeam mode
(always creates two teams)
2011-11-08 17:27:32 +00:00
Sven Eberhardt 05e7aa1568 Fix EliminatePlayer(..., true) inactive client activation 2011-11-08 16:16:31 +00:00
Peter Wortmann fec07accd7 Save more minimal players on remote clients 2011-08-15 09:25:37 +00:00
Peter Wortmann 8b9ace23c9 Fixed the surrender dialog showing after declined kick vote 2011-05-08 22:36:48 +02:00
Armin Burgmeier 6fd98efabd Add a copy of MultiUser.nsh patched for installation of 64 bit binaries 2012-02-02 22:24:35 +01:00
Julius Michaelis d222e2b2eb Update 1st tutorial's descriptions and fix its mechanics a little 2012-02-02 21:02:18 +01:00
Felix Wagner 313404e8b9 Bigger elevator 2012-02-02 02:25:36 +00:00
Felix Wagner 378c4f491b Replaced the noncommercial sound effects with free ones 2012-02-02 01:45:05 +00:00
Armin Burgmeier 73654821ea Fix timsort so that it compiles with Visual Studio 2012-02-01 23:03:29 +01:00
Maikel de Vries c68b5b2920 Menus: implemented closing when clicked in the landscape 2012-02-01 22:29:49 +01:00
Armin Burgmeier 0749dcdb9d Replace std::sort by timsort for Face ordering
The usage of timsort instead of std::sort at this point is twofold.  First,
it's faster in our case where the array is already sorted in many cases
(remember this is called at least once a frame). And it's not just a bit
faster either but a lot. I have measured a factor of 7 on my system.

Second, in our Windows autobuilds there is a crash within std::sort which is
very hard to debug because it's hardly reproducible with anything other than
the autobuilds (I tried hard). If the crash goes away with timsort then
great, if not then maybe it's easier to debug since the code is in our tree.
2012-02-01 22:11:46 +01:00
Felix Wagner 1f8ac47242 Elevator texture 2012-02-01 18:20:19 +00:00
Felix Wagner 95c06714e1 Replaced BlastLiquid sounds, removed Munch1 for wrong license, renamed Munch2
to Munch1
2012-02-01 16:31:21 +00:00
Felix Wagner 1c40fa5928 Licensing change 2012-02-01 01:18:09 +00:00
Armin Burgmeier 18c96d4987 C4MouseControl: Don't set TargetObject to non-selectable objects in crosshair mode
This makes mouse click controls not being delivered to MD_NoClick objects.
2012-01-31 23:46:15 +01:00
Maikel de Vries 8a02a17d44 Removed mousedrag&drop for actionbar
This was wrongly introduced some commits ago
2012-01-31 23:26:51 +01:00