Commit Graph

2932 Commits (2db0970156b484416e7a6191fb0ef1aeb327b0f6)
 

Author SHA1 Message Date
Günther Brammer 3844dc8740 Script: PlayerObjectCommand only takes ints as Tx parameter
C4Object::ObjectCommand was not updated for the C4Value-in-C4Command change
and still exposed the raw pointer values. Given that SetCommand works just
fine for "Call" commands, simply change the Tx parameter to int.
2011-03-28 18:43:59 +02:00
Günther Brammer 7fa761a2a6 Script: AddMenuItem any parameter only accepts object and definition proplists 2011-03-27 18:17:18 +02:00
Günther Brammer 303359f4ab Particles: Remove the unused target coordinates from Face
Particles were always drawn centered around their position, and the
"used because stup" comment explaining the use of C4TargetRect instead of
C4Rect is probably outdated.
2011-03-28 18:36:16 +02:00
Günther Brammer e31e2351c6 Do not update waypoints before transfer zones
Unused variable noticed by gcc 4.6.
2011-03-28 18:38:44 +02:00
Günther Brammer 0c5f1be59d Fix network connection error messages after OSTR removal
Using const char * as an out parameter doesn't work. Finally noticed by
gcc 4.6.
2011-03-28 18:29:19 +02:00
Günther Brammer 38ee07e7fc Remove unused third StdStdBuf::ReplaceChar parameter
C4InputValidation tried to use it but obviously couldn't. Validation of
absolute windows filepaths remains as broken as before.
2011-03-28 18:27:01 +02:00
Günther Brammer 2031fb0644 Do not enumerate pointers before saving
Instead, retrieve the number on demand during serialization. This saves
lots of unnecessary code and makes serialization actually not modify the
objects. At least with the exception of nInfo, but that should be save.
2011-03-28 00:15:06 +02:00
Günther Brammer 8a17593c99 Fix StdMeshInstance deserialization
The BitfieldAdapt had a builtin default of 0 for serialization, so it needs
that default when deserializing. Also remove that builtin default.

When AnimationNodes were loaded out of order, some of them were thrown away
when their vector was shortened. Don't shorten the vector during load.
2011-03-31 01:25:27 +02:00
Günther Brammer b403fc61c1 Reduce code duplication a bit 2011-04-01 00:03:02 +02:00
Günther Brammer e6e5b801d6 Check proplist reference lists in debug builds
This should help find the next added-to-list-twice bug.
2011-03-31 22:53:07 +02:00
Günther Brammer 38e9926c12 Do not add a C4Value to a proplist reference list it already is on
This could happen when nType was PropList or Object and Type was the other.
2011-03-31 22:26:07 +02:00
Günther Brammer f3365ab73b Arrays with multiple references are stored just once
This is done with the new C4ValueNumbers class. Every array and proplist
with the exception of objects, definitions and effects gets a number
when the game is saved and is restored via that number on load.
2011-03-27 18:14:41 +02:00
Günther Brammer c8ad0228b2 Store Objects in the Game.txt instead of a separate Objects.txt 2011-03-27 16:51:14 +02:00
Günther Brammer f582a97998 Add C4ValueNumbers helper class and pass it through to C4Value::CompileFunc
In preparation of using that class to enumerate and denumerate various
pointers.
2011-03-26 23:59:35 +01:00
Günther Brammer 5fd6770edd Re-add entry in player menu to save the game 2011-03-27 18:22:55 +02:00
Sven Eberhardt b01cddc560 control config dialog improvements 2011-03-31 16:26:59 +02:00
Sven Eberhardt 269c7b208c control config dialog 2011-03-30 22:11:47 +02:00
Felix Wagner 8e92f1904c Cables break on bending and when reaching max range (200 pixels so far), presumably unoptimised stuff 2011-03-30 01:37:13 +02:00
Maikel de Vries b1c7096132 Objects: Code from crossing to library_cablestation
This is only the movement, many implementation details are still missing in the library.
2011-03-29 18:51:30 +02:00
Maikel de Vries 7474031691 Objects: Moved cable car library from tests to libraries
Needed to create cable station library.
2011-03-29 18:48:14 +02:00
Maikel de Vries f5efd2067b Objects: Fixed pickaxe hovering
A clonk could hover with the pickaxe by repeatedly using it in mid-air.
2011-03-25 16:34:15 +01:00
Günther Brammer b5dea20dae Remove some dead code 2011-03-27 18:15:10 +02:00
Günther Brammer 69d161bdbb editor: Go into startup mode if the first scenario failed to load (#592)
Previously, the application would try to go into startup because the
editor was active, but then try to start a scenario because the startup
mode flag wasn't set. Check both the start flag and the editor flag in both
places.
2011-03-27 17:58:41 +02:00
Maikel de Vries 84411c3106 Tests.ocf: Moved scenario local objects to Experimental.ocd
This to assure that general purpose objects can be tested throughout different scenarios and in combination with different objects.
2011-03-23 15:16:52 +01:00
Felix Wagner a36470c558 You can now manually engage the lorry to the cable, grab the lorry, push it to a station, interact while grabbing
You can then select a destination, select with left/right, start with leftclick/space, cancel with rightclick
2011-03-23 03:09:09 +01:00
Julius Michaelis bf161543b7 Fix 1aab98cfd1e2 2011-03-22 16:42:36 +01:00
Günther Brammer 0f44b39ab9 Split CStdApp out of StdWindow.h into StdApp.h 2011-03-19 22:09:10 +01:00
Günther Brammer 1b361bbcb7 win32: Remove some unnecessary CStdApp helper functions 2011-03-21 17:54:34 +01:00
Günther Brammer 513dd9b252 A simple priority mechanism for the StdScheduler
Everything is more important than the next game tick: network activity,
user input or editor redraw.

On windows, the ordering is still delegated to (Msg)WaitForMultipleObjects.
2011-03-19 13:59:56 +01:00
Günther Brammer fe1ea5c5a3 linux: remove inotify support on glibc < 2.4 2011-03-17 02:33:56 +01:00
Günther Brammer cacceef1c6 linux: use eventfd for CStdNotifyProc 2011-03-17 02:26:37 +01:00
Günther Brammer 03b3678050 Remove unused CStdNotifyProc::Check 2011-03-17 02:22:33 +01:00
Günther Brammer 8036211c30 linux: Use timerfd instead of poll timeouts 2011-03-15 17:27:10 +01:00
Günther Brammer acac8a01d4 Store the name of an effect in its proplist 2011-03-16 19:07:18 +01:00
Günther Brammer 487ccfd762 Remove unused C4Effect::iNumber 2011-03-16 17:59:25 +01:00
Günther Brammer 682319cc2b Remove unused Get-Effect-by-number function 2011-03-16 17:51:30 +01:00
Günther Brammer b533c8b8fc Split C4Effect construction into static function and constructor
This way, the function can return the effect that absorbed the new effect.
2011-03-16 17:51:03 +01:00
Julius Michaelis 7827f60775 Fix 3f4fcad06cfd 2011-03-21 23:26:21 +01:00
Julius Michaelis 9e1bff2e17 Save IRC clients joined channels 2011-03-21 22:39:36 +01:00
Felix Wagner c8bc3f8621 Fixed station overlay, now working 2011-03-21 21:38:10 +01:00
Felix Wagner 64f1f88b8d Code cleaning, sourced the lorry stuff out into its own library, comments added 2011-03-21 18:49:49 +01:00
David Dormagen a38de1ecd0 Extinguish() fix 2011-03-16 10:12:09 +01:00
Charles Spurrill c5dc03879b added chop animation, dive animation, and fixed some other anims like the landing-crouch, and improved others that I've since forgotten 2011-03-15 02:37:02 -07:00
Günther Brammer 58e4e3aa6b Blame the first group in a groupset if no group had the desired file 2011-03-14 21:53:55 +01:00
Günther Brammer 2465c05afc Don't crash trying to display stringtable-not-found error message (#588) 2011-03-14 21:04:27 +01:00
Martin Plicht 2eb7a7c3e2 mac: Remove old c4 icons and replace by low-res oc icons, adjust file types understood by app 2011-03-14 21:54:56 +01:00
Julius Michaelis 61d93c39cf Fixed some files which didn't include C4Include properly (all except C4Globals.cpp caused by 17d0ceb9ef2f) 2011-03-14 16:32:01 +01:00
Julius Michaelis 11575222f0 gcc&cmake: precompiled header support 2011-03-12 22:01:23 +01:00
Armin Burgmeier 0f85881ce9 Fix starting the engine with a scenario with a trailing slash 2011-03-14 20:56:03 +01:00
Martin Plicht bbbe2ace49 mac: Use new file extensions 2011-03-14 20:12:00 +01:00