Commit Graph

1053 Commits (2e0b00a5e02fb787cf8672eb9350f19532dd3ccf)

Author SHA1 Message Date
Martin Plicht b4157c5ec9 C4SoundLoaders: Remove duplicate header includes 2010-12-13 21:54:44 +01:00
Martin Plicht cc95f8231f Add IsGermanSystem as forward declaration to PlatformAbstraction.h and implement IsGermanSystem, OpenURL and EraseItemSafe in platform-specific files (StdWindow.cpp/StdGtkWindow.cpp etc) 2010-12-27 03:19:19 +01:00
Martin Plicht cd290cdb39 Mac: Re-add ReadStdInCommand 2010-12-27 02:18:11 +01:00
Martin Plicht 31aec1bf1a C4Startup.h: Indentation fix 2010-12-08 02:48:46 +01:00
Martin Plicht eb26711102 C4GamePadCon: Fix some method signatures and a preprocessor directive 2010-12-24 14:18:51 +01:00
Martin Plicht 872fbe162f C4Network2: Fix comment typo 2010-12-24 14:17:42 +01:00
Martin Plicht afd09a2e64 C4InteractiveThread: Don't include StdWindow.h but boost/function.hpp 2010-12-24 14:17:28 +01:00
Martin Plicht 093ca56eaa C4Viewport: Add method to set zoom directly 2010-12-06 21:32:27 +01:00
Martin Plicht b42e9ab26f C4Viewport: Add DropFile method 2010-12-06 21:31:37 +01:00
Martin Plicht 96b90a5c35 C4Viewport::GetZoomByViewRange: Fix uninitialized-variable problem 2010-09-17 14:35:24 +02:00
Günther Brammer a89667f3d7 Merge C4ValueList and C4ValueArray into one class
Now that the last usage of numbered variables in effects is gone,
C4ValueList wasn't used except as a base class. If the array and
refcounting aspect should be separated at all, the reference count
should be in the base class.
2010-12-27 17:05:35 +01:00
Günther Brammer d2e4f8d544 Script: Remove ChangeEffect in favor of effect properties 2010-12-27 16:27:39 +01:00
Tobias Zwick 6da6f6a73b fix: Version information from masterserver is correctly parsed
PeterW changed some stuff about the INI parser. I adjusted the parsing of the version info from the masterserver to fit his change
and let the C4Network2RefClient inherit from the C4Network2UpdateClient (as refclient does the same as updateclient only more) while I was at it.
2010-12-27 01:07:59 +01:00
Tobias Zwick 311dcfbb7a Clonk client redirects user to download page if new version is available but not as update 2010-12-27 00:31:25 +01:00
Armin Burgmeier 1967d914c2 Add a compile-time option to disable automatic update 2010-12-26 21:39:52 +01:00
Armin Burgmeier 63faacc520 Fix update procedure on Windows
by letting c4group wait for the Clonk process to terminate
2010-12-26 20:49:04 +01:00
Julius Michaelis eb6d3db1f4 Log to record file, too, when recording 2010-12-25 16:00:59 +01:00
Günther Brammer 884572bbb3 Script: Reflect C++ effect variables as properties
With references gone, the engine can sanely run code upon modification of
properties, or throw exceptions on read-only ones. This obsoletes one use
case of GetEffect, simplifying the function a lot.
2010-12-24 15:10:39 +01:00
Günther Brammer e1874a5a1d Script: GetEffect can again return an effect by index 2010-12-23 22:55:04 +01:00
Maikel de Vries 0e2cf625e8 C4Script: GetEffect returns effect instead of number.
This will fix scripts using GetEffect to find and use an effect.
2010-12-23 16:01:18 +01:00
Günther Brammer be342d4a51 copyright notices update 2010
This time with more manual checking and using git blame -M -C, so that
a few cases of copied code get a copyright notice corresponding to
their initial introduction.
2010-12-23 01:01:24 +01:00
Günther Brammer 6025602038 Script: Correctly backtrace exceptions
Global functions conspire with appendto/include to make this all horribly
fragile.
2010-12-22 04:26:37 +01:00
Günther Brammer 1da199830e Remove a debug printf 2010-12-22 02:11:16 +01:00
Günther Brammer 40c24961dd Correctly map bytecode to linenumber for global/appended/included functions
The method to get the C4AulScript instance that stores the bytecode of a
function is ridiculous, but at least it's now capsuled in a function. While
at it, this also always stores the bytecode index instead of a bytecode
pointer in the function.
2010-12-22 02:10:58 +01:00
Günther Brammer a8abb445fd Renumber Commands after Energy removal to avoid crashing
The table used by CommandByName got out of sync with the command numbers.
2010-12-22 01:59:27 +01:00
Günther Brammer b562acb32c Script: Remove EffectVar, update effect documentation 2010-12-21 21:57:40 +01:00
Günther Brammer 8996fd3072 Script: RemoveEffect and ChangeEffect don't require effect with effectname 2010-12-21 19:20:55 +01:00
Günther Brammer 9ad1a3acff Script: GetEffect with name instead of effect instance works again 2010-12-21 01:40:40 +01:00
Maikel de Vries 53e507d2c5 Engine: Removed Power system including all components
Removed power lines, power connects, energy rule, power OCFs, Energy command, C4Script CheckEnergyNeedChain and EnergyCheck, Action EnergyUsage and documentation.
2010-12-15 21:02:50 +01:00
Günther Brammer 6140c73e81 Script: Change effect functions to use the effect instead of the number
This doesn't require any script changes because the effect callbacks don't
heed the parameter type information.
2010-12-20 00:19:24 +01:00
Günther Brammer e2c6a5fd17 Script: Effects are now proplists, too
This doesn't yet affect any script interfaces,
2010-12-20 00:13:56 +01:00
Günther Brammer f801ab61f5 Clear out interned strings instead of them deregistering themselves
This probably prevents a crash when the strings are destructed after the
set.

Also show all C4Strings that are still in the stringtable at the end for
debugging purposes.
2010-12-17 00:31:51 +01:00
Peter Wortmann f00ec07a7b Reference: Compile UpdateURL as RCT_All, set default so parsing won't fail because of it. 2010-12-19 20:16:18 +00:00
Peter Wortmann 0c8bac0140 StdCompiler: Removed "compatibility" hack to have RCT_Escaped fallback to RCT_All.
RCT_Escaped is meant to be used when embedding a string into a custom encoding of a structure. That's why it has a terminator symbol and escapes anything that could be interpreted as a seperator. Falling back to RCT_All completely destroys this safeness, as it just blindly copies everything. In case this kind of functionality is really needed, introduce RCT_EscapedAll or something similar.
2010-12-19 01:43:40 +00:00
Maikel de Vries e049c553a0 C4Script: Removed obsolete DrawVolcanoBranch
Use DrawMaterialQuad instead.
2010-12-15 23:23:29 +01:00
Maikel de Vries 2af84845b5 C4Def: Removed obsolete LineLightning and LineVolcano
These things are or will be implemented in C4Script.
2010-12-15 19:56:50 +01:00
Nicolas Hake dbb75f98cb win64: Fix crash when a C4String gets allocated at >4GB 2010-12-16 17:26:52 +01:00
Maikel de Vries 10acc3967e Physical: Helper functions to Set and Get MaxEnergy
Only needed in tut04, these make the necessary callbacks.
2010-12-13 23:22:15 +01:00
Maikel de Vries 92bd67f250 Physical: Breath value now represents the number of frames an object can hold his breath.
More precise values do not make sense and complicate stuff.
2010-12-13 22:46:42 +01:00
Günther Brammer fb28777c70 Physical: Remove the now unused implementation details 2010-12-13 02:58:22 +01:00
Günther Brammer fccd5597bc Physical: Replace Throw with a ThrowSpeed property 2010-12-13 02:17:21 +01:00
Günther Brammer 39e385a8da Physical: Replace Jump Physical with JumpSpeed property 2010-12-12 23:49:18 +01:00
Günther Brammer b9c1790c48 Physical: Replace Breath with a MaxBreath property 2010-12-12 23:01:08 +01:00
Günther Brammer b591ee0dc2 Physical: Replace Energy with a MaxEnergy property 2010-12-12 22:38:15 +01:00
Günther Brammer 1760c8851d Physical: Make BreatheWater and CorrosionResist simple properties 2010-12-12 21:49:47 +01:00
Günther Brammer 5bb3e81f4f Physical: Remove Magic and associated other Magic 2010-12-12 01:25:58 +01:00
Günther Brammer 086e3e9e10 Physical: Remove unused Can* values, instead rely on action availability 2010-12-12 01:09:29 +01:00
Günther Brammer d31371cb95 Physical: Float speed and acceleration is now an Action property 2010-12-12 00:05:42 +01:00
Günther Brammer 434c45d00c Physical: Dig phase advance is now an Action property 2010-12-11 23:40:34 +01:00
Günther Brammer b63940742e Physical: Push and Pull acceleration is now an Action property 2010-12-11 23:28:01 +01:00
Günther Brammer d1231cfef3 Physical: Swim speed and acceleration is now an Action property 2010-12-11 23:14:30 +01:00
Günther Brammer 07025c2613 Physical: Walk speed and acceleration is now an Action property 2010-12-11 21:10:05 +01:00
Günther Brammer 8b03b2c149 Physical: Scale and Hangle speed and acceleration is now an Action property 2010-12-11 22:00:06 +01:00
Günther Brammer 9c928ec283 Physical: Remove automatic training 2010-12-12 17:45:38 +01:00
Günther Brammer 719ed39632 Remove FairCrew and permanent Physicals 2010-12-10 01:06:38 +01:00
Günther Brammer 00a07a1d24 Script: Add ResetProperty to reset properties to reflect the prototype 2010-12-12 01:49:05 +01:00
Günther Brammer 220182639f GTK editor mode: A little bit more margins and borders 2010-12-15 22:39:21 +01:00
Tobias Zwick 24847bb014 fixed #536: Gamepad: zooming with buttons needs several clicking 2010-12-15 02:16:24 +01:00
Günther Brammer 8e52daf128 win32: make d3d code compile again 2010-12-14 02:06:48 +01:00
Günther Brammer 8c2d2d3cc1 editor: consolidate the four status text fields in one function
Only a very minor improvement in terms of lines-of-code, but still.
2010-12-14 02:06:23 +01:00
Günther Brammer 511e835955 GTK editor mode: Use a toolbar instead of normal buttons for main controls 2010-12-14 00:52:42 +01:00
Nicolas Hake 96f65c21a9 win32/editor: Consider editor active once window has been created 2010-12-13 17:37:07 +01:00
Nicolas Hake d59d5b94f1 win64/debug: Use correct size type for operator new overload 2010-12-13 17:31:21 +01:00
Günther Brammer c7319206f2 Action: Keep a reference on the last action in SetAction
Otherwise, the last action could be destroyed before the end of the
function when it wasn't in the ActMap anymore.
2010-12-12 21:12:04 +01:00
Günther Brammer 0b746f756a Autotools: Add new editor files and rename a new header to .h
If it's #included, it's a header, even if it looks like a normal
compilation unit.
2010-12-13 03:11:06 +01:00
Armin Burgmeier 610276e56d Fix a crash when opening a second viewport for the same player 2010-12-12 22:38:19 +01:00
Armin Burgmeier ed86f1a97e Add some comments explaining how the Glib main loop integration works 2010-12-12 19:16:21 +01:00
Armin Burgmeier f3952bc3f7 Glib main loop: Don't freeze when iterating the mainloop from a callback
This made File/Open in the GTK editor freeze
2010-12-12 17:43:46 +01:00
Armin Burgmeier 51aee6b4af GTK editor mode: Fix widget callbacks (most interactions lead to a crash before) 2010-12-12 17:10:13 +01:00
Armin Burgmeier 27b39489aa GTK editor mode: Fix GTK+ warnings when closing console window 2010-12-12 16:32:56 +01:00
Armin Burgmeier 559d312fb8 Fix viewport drawing in fullscreen mode 2010-12-12 15:27:48 +01:00
Armin Burgmeier fabc022481 Fix crash when starting a scenario in console mode on Linux 2010-12-12 14:53:57 +01:00
Armin Burgmeier 07d226b510 Possible crash fix: Reset pLast in C4GUI::Container::ClearChildren() 2010-12-12 14:21:18 +01:00
Sven Eberhardt 1d404730e4 console mode: fix tool ctrls 2010-12-12 13:58:10 +01:00
Sven Eberhardt 1b4b801fec Win32 compile fixes 2010-12-12 13:53:51 +01:00
Martin Plicht 44928f1a8d Platform-specific code in C4Console.cpp gets factored out into C4Console(Win32/GTK).cpp 2010-12-11 19:50:38 +01:00
Maikel de Vries 96048e02c4 IRC: changed default channel to #openclonk
There are no people in #openclonk-lobby at all, therefore we´d rather invite people to a filled channel, if there is too much spam in #openclonk we can always decide to make a special moderated lobby channel.
2010-12-11 16:12:37 +01:00
Günther Brammer f02580df14 Script: Inline C4String::IncRef/DecRef
No measurement whether this helps, but these functions are very simple.
2010-12-08 23:27:02 +01:00
Günther Brammer 0fdd134728 Action: Procedure is specified by a String
Also moves the Action Procedure names to the central stringtable.
2010-12-08 23:17:00 +01:00
Günther Brammer c16102ec9b Shrink StdBuf from 24 to 16 bytes and C4PropList from 56 to 48 on amd64
There's no need for Buffers which exceed 4 GB size in Clonk. C4PropList
just had some padding for alignment.
2010-12-06 19:04:32 +01:00
Günther Brammer 4e4d32f86b Create preallocated C4Strings statically instead of allocating each one
This makes it easy to convert a C4String* to a C4PropertyName, which will
be useful for reflection of internal properties.
2010-12-06 16:24:41 +01:00
Günther Brammer 26c670b29d Improve internal C4PropList interface for predefined property names
SetProperty now also has a wrapper, and the common case of
GetPropertyVal(P_Foo) is now GetProperty(P_Foo).
2010-12-06 16:19:15 +01:00
Armin Burgmeier 011a12ed27 Update XPM icon from CZ to OC 2010-12-10 23:42:00 +01:00
Sven Eberhardt 0f843ab687 reset OnFire status when fire effect is cleared on Clonk death (#222) 2010-12-10 16:00:53 +01:00
Sven Eberhardt f989a37519 move boost after PlatformAbstraction to prevent redefinitions from stdint 2010-12-09 12:19:39 +01:00
Armin Burgmeier 4f4162855f C4Include: Include boost before anything that potentially uses it
Fixing the linux and MinGW builds
2010-12-08 20:20:41 +01:00
Maikel de Vries ba6b41c058 Engine: Removed FIGHT procedure and all related stuff.
This is obsolete with new melee implementation and other authors should either use that or make something unique themselfs. Removed DFA_FIGHT, C4Script FnFightWith, ObjectActionFight, NoFight, OCF_FightReady, Fight Physical
2010-12-07 18:57:27 +01:00
Sven Eberhardt e2a580fd55 revive MSVC10 memleak checking and fix a few memleaks 2010-12-07 23:43:00 +01:00
Sven Eberhardt 7e971d7405 fix error when accessing &Code[0] on empty code during script parsing
caused by 4d1af7ffee78, when code was changed from a C style array into a std::vector
2010-12-07 19:27:59 +01:00
Maikel de Vries 1d83895487 C4Soundloaders.cpp: Fixed broken build 2010-12-07 18:56:55 +01:00
Martin Plicht 78e6a6f4db C4MaterialMap::Clear: Also set Num to 0 2010-12-04 04:31:25 +01:00
Martin Plicht 4c14ca4f5b Unnecessary check is not so unnecessary after all 2010-12-06 13:05:25 +01:00
Martin Plicht f6f86f1ada Fix some indentation problem 2010-12-06 14:01:25 +01:00
Martin Plicht 07a7aa1ddd C4Config: Save & Load -> same file 2010-08-09 14:52:32 +02:00
Martin Plicht 62b85fe51c Remove Kbd*Key* configuration 2010-12-07 02:21:20 +01:00
Martin Plicht 8ddeb8ebdb Some fixes to C4SoundLoaders 2010-10-02 01:06:51 +02:00
Günther Brammer 8bd9179606 Script: Inline C4Value::Set and the C4Value functions it calls
Apart from these functions just being small enough to reasonably
inline, the compiler might be able to optimize parts of them away based on
knowledge of the type of the new or old content of the C4Value.
On at least one artificial benchmark, this does help significantly.
2010-10-26 03:05:20 +02:00
Günther Brammer d02c424dab Script: Split SPos out of the bytecode into an extra vector for speed
SPos is only needed to display debug messages. Not having that data in the
cache for normal execution speeds up script execution by ten percent on at
least one artificial benchmark.
2010-10-25 23:48:08 +02:00
Günther Brammer 7f899cc1b0 Make AssignRemoval a C4Object-only-feature, C4PropLists don't need it 2010-10-30 00:05:36 +02:00
Günther Brammer 4a256d1953 Script: Every identifier is allowed after a dot
Previously, the tokenizer would emit special tokens for a few keywords. Now
every keyword is handled by the parser. This allows one to use keywords as
identifiers everywhere it is unambiguous.
2010-10-20 00:37:31 +02:00
Günther Brammer 4876db8f2d Remove unused C4PropList::HasProperty
There might be a usecase for finding out from script whether a property is
on an object instead of a prototype of the object, but so far that feature
has not been missed.
2010-10-17 22:15:32 +02:00
Günther Brammer 01eed03487 Make C4PropList::Properties private instead of protected 2010-10-17 22:13:12 +02:00
Günther Brammer bcdb7b9f56 Remove a TODO which is obsolete since 2005 2010-12-04 23:08:47 +01:00
Günther Brammer e0ce6798bf Remove a unused function declaration from Stdsurface2
The implementation was removed in the split into Surface2/Surface8, but the
declaration was not removed from the header.
2010-12-05 19:33:20 +01:00
Günther Brammer 47594765cb c4group: Remove unused -a, -m, -e, -d, -r, -o commands
The new release scripts use -p instead. This doesn't make c4group a lot
simpler, but every bit helps.
2010-12-05 19:04:40 +01:00
Günther Brammer ccf84f5dbe c4group: Remove Maker information.
It is useless without the shareware registration providing a name.
2010-12-05 18:57:06 +01:00
Günther Brammer 0d59854c5c GUI: Remove superfluous checks for IsGUIValid() and GetScreenS()
Some of them should rather check whether the user has closed the window,
though.
2010-10-30 02:08:58 +02:00
Günther Brammer 75c2b21ee8 GUI: Remove superfluous checks for pGUI 2010-10-30 01:47:50 +02:00
Günther Brammer 57f39cf645 X11: Remove duplicate OnResolutionChanged calls 2010-12-05 17:17:03 +01:00
Günther Brammer bf5c6cb231 Make gunzip4c4group build again
Hopefully nobody will actually have to use that tool, but one never knows.
2010-11-14 23:50:45 +01:00
Günther Brammer 2e612a6900 C4ID: centralize all still used ids 2010-12-05 00:36:07 +01:00
Günther Brammer 5d7ad6d859 Remove obsolete object-based Smoke, use particles instead 2010-12-05 00:33:22 +01:00
Günther Brammer 471b546c56 Script: FindConstructionSite returns 0 when the search fails 2010-12-04 23:48:17 +01:00
Günther Brammer 0a36b23a18 Clean up some unused-variable warnings 2010-12-04 23:44:57 +01:00
Armin Burgmeier cfad8f67cd Order submeshes so that opaque ones are rendered before non-opaque ones 2010-12-04 23:33:05 +01:00
Maikel de Vries c150725dd5 Engine: Objects hit only if both speed and and relative speed exceed HitSpeed2
This is bugfix to c1b41a96cdc6, since not moving objects like a fused dynamit could induce a hit.
2010-12-04 17:02:16 +01:00
Charles Spurrill d0d1452664 Default control rate in network games is 3, not 1 2010-12-03 21:20:23 -08:00
Günther Brammer 1cf7bb8e8d Landscape: Hardcode sky transparency directly (#317)
Since "Remove a lot of old obsolete palette code", the landscape palette
does not have a transparent color at position 0 anymore. Instead of
restoring that invariant, stop getting the sky color from the palette.

Since every other color was taken from a texture already, stop using the
palette altogether for ingame landscape display.
2010-12-04 02:24:13 +01:00
Günther Brammer 673e7946e7 Engine: Remove long-obsolete C4Player::Color (ColorDw is used instead) 2010-12-04 02:16:41 +01:00
Günther Brammer aa0cef3a8d win32: Replace most BOOL usages
The callbacks apparently changed for 64 bit support, and
RegisterWindowClass is just a simple C++ function. Unfortunately, there's
one callback left.
2010-12-03 20:25:17 +01:00
Tobias Zwick d6778782be default: no runtime join = 1 2010-12-04 00:56:58 +01:00
Günther Brammer 26ea10106f Remove the php extension from the download URL
Hopefully, the url won't change that way when the implementation changes.
2010-12-03 22:48:34 +01:00
Charles Spurrill 75b8cc6034 Correct download link on update failure 2010-12-03 13:23:01 -08:00
Sven Eberhardt ec2fad98c5 fix OpenGL drawing after a new context has been created (#450) 2010-12-03 20:18:36 +01:00
Charles Spurrill bac267f423 addon to maikel's relative hit check for objects; object must be moving to call hit (no hits when clonk runs over objects) 2010-12-02 15:12:54 -08:00
Maikel de Vries 9669af1dc8 Realistic hit energy only for relative speeds larger than HitSpeed2 2010-12-02 22:03:47 +01:00
Sven Eberhardt fee6ea0b87 fix crash on config reset (#500) 2010-12-02 20:59:59 +01:00
Sven Eberhardt be8ef23f83 fix exclusive startup GUI after a game (#497) 2010-12-02 19:20:56 +01:00
Tobias Zwick 4b51f61ffd Made the clonk accelerate a little faster while floating and walking 2010-12-02 18:22:20 +01:00
Tobias Zwick f5790fbeae fixed masterserver query string in StartupNetDlg 2010-12-02 18:21:57 +01:00
Maikel de Vries 28816119cb Removed MELE goal dependent MinPlayer check
This is superfluous since a scenario designer can set this in Scenario.txt and ID dependence in the engine is to be removed.
2010-12-02 11:43:55 +01:00
Tobias Zwick 07d899bb0b line endings to unix format 2010-12-02 00:41:47 +01:00
Tobias Zwick 952f6b193c fixed new update system 2010-12-01 23:00:56 +01:00
Tobias Zwick 9f8fa02b8e new update system 2010-12-01 21:37:47 +01:00
Benedict Etzel 50e16e8cfc Renamed IsWindowsVista to IsWindowsWithUAC including Windows 7 2010-11-27 14:32:48 +01:00
Günther Brammer d92b9976a1 Remove all remaining GUI elements on C4Game::Clear (#477)
This was done when removing the Screen instance, do it when clearing the
screen instance instead.
2010-11-27 02:30:02 +01:00
Tobias Zwick 0c45723460 Merge 2010-11-25 20:23:23 +01:00
Tobias Zwick 103cab8ac4 Backed out changeset: f8fdee72ee07 2010-11-25 20:23:07 +01:00
Tobias Zwick 56937d4179 IRC-chat fixes
+ Now can join #play-clonk. Anything that adheres the pattern #*clonk*
+ /help actually works now
+ /query nickname message - does not create a chat with "nickname message"
2010-11-25 19:02:23 +01:00
Günther Brammer b946751f36 Fix problems found by z33ky with g++ 4.6 2010-11-25 15:24:49 +01:00
Tobias Zwick 8f7b93162b Removed function MakeCrewMember (use SetCrewStatus)
- unbelievable how many files I have to edit for that, phew.
2010-11-25 13:57:50 +01:00
Tobias Zwick 499582d543 removed some obsolete variables in C4Object once used by the engine-HUD 2010-11-25 13:39:39 +01:00
Tobias Zwick db7486f494 removed portrait-related options from the GUI 2010-11-25 13:24:09 +01:00
Tobias Zwick 44af873931 some more translated strings (highreslandscape) 2010-11-25 13:18:24 +01:00
Günther Brammer f495350cbb Script: Remove AnyContainer, NoContainer, GlobalN, LocalN, VarN and Equal
Use Find_AnyContainer, Find_NoContainer, proplists, obj["foo"], proplists
and == instead.
2010-11-24 22:26:27 +01:00
Tobias Zwick e1450e7dcc translated string 2010-11-24 13:13:06 +01:00
Nicolas Hake 4faacde682 win64: Fetch correct update package 2010-11-18 20:45:28 +01:00
Nicolas Hake 59594a9ef2 Default all unowned ColorByOwner objects to blue (#486) 2010-11-15 12:22:08 +01:00
Nicolas Hake 427e8125b1 Fix mismatched new/delete in C4GUI::Edit::EnsureBufferSize 2010-11-09 15:18:18 +01:00
Nicolas Hake 425aa6e67a Fix mismatched new/delete in C4GUI::Edit::ClearText 2010-11-09 15:15:05 +01:00
Günther Brammer 9494b90fe8 win32: Copy, paste and type arbitrary Unicode characters 2010-11-04 02:08:02 +01:00
Nicolas Hake 0a932c656f Disabled 'League' button (#479) 2010-11-09 13:17:02 +01:00
Maikel de Vries 901186e275 Fixed breath bug (#58) 2010-10-31 19:39:06 +01:00
Tobias Zwick 3f2f5d8d3f commented out entry in player menu to save the game 2010-10-31 17:37:45 +01:00
Günther Brammer b0d9d73af6 GUI: Do not allocate the Screen dynamically, it's always used (#442)
At least according to Isilkors analysis, this should fix the crash.
2010-10-30 01:19:54 +02:00
Maikel de Vries 7d5dfa5312 Fixed #474 - rabies 2010-10-27 22:54:54 +02:00
Maikel de Vries 98c0a1d81f Cleanup bubble script and create bubbles on splash again 2010-10-25 19:14:30 +02:00
Günther Brammer 4438986167 Script: don't crash on 0[n]
The typecheck relied on the fact that nullpointers were always C4V_Any,
which is not true anymore. Instead, directly check that the array that will
be used is not a nullpointer, which aligns the check with the usage instead
of C4Value implementation details.
2010-10-25 03:40:57 +02:00
Günther Brammer fe9a13f071 Script: proplist access via foo.bar returns nil for nonexistent properties
Previously, it returned the proplist, which was neither helpful nor
intended.
2010-10-18 01:45:49 +02:00
Günther Brammer e252d91efa Remove the menu functionality from the Construct Command in favour of script 2010-10-17 21:38:56 +02:00
Günther Brammer c14ca10f89 Remove unused engine internal Explosion function 2010-10-14 23:24:16 +02:00
Günther Brammer ecb46bb188 Windows: Fix editor icons and other potential breakage related to HINSTACE
I even wrote the function for this but forgot to use it. Probably due to
hope that someone would replace that stuff with GetModuleHandle(0).
2010-10-12 00:44:22 +02:00
Günther Brammer 943143cd6b Remove C4D_Knowledge in favour of a pure script solution of some sort
The only effect of C4D_Knowledge was that unfinished objects with the flag
could not leave buildings. That can be accomplished with script callbacks
if necessary, but this will probably work differently anyway.
2010-10-11 20:40:47 +02:00
Günther Brammer 70d2256e39 Remove C4D_Magic in favour of a pure script solution of some sort
The engine didn't do anything useful with it except enforce that a player
only can have magic that has the magic magic category and not complain
about magic missing a sort category. That's not enough to justify the flag.
2010-10-11 20:30:47 +02:00
Günther Brammer 15a796a856 Remove C4D_CrewMember in favour of OCF_CrewMember
The only usage is easily replaced by Def->CrewMember.
2010-10-11 20:18:38 +02:00
Günther Brammer 418257ef26 Remove C4D_TradeLiving in favour of C4Def::NoGet
Previously, C4D_Livings without C4D_TradeLiving had an implicit NoGet. They
now have to use that flag like every other object.
2010-10-11 19:59:54 +02:00
Nicolas Hake f7588418c1 gl: Fixed incorrect delete on surface unlock 2010-10-11 18:17:58 +02:00
Maikel de Vries 860ef8b190 Removed MaxUserSelect and C4D_Select*
Since we don´t have the CR editor anymore, these categories are useless.
2010-10-08 14:00:41 +02:00
Günther Brammer b016b72d12 MSVC: Fix 'C4Fixed::operator +' : 3 overloads have similar conversions 2010-10-11 02:33:13 +02:00
Günther Brammer cd68d6ceb3 Remove the last traces of Clonk Rage from comments
Also treat every regkey as valid. It's just a bonus for old Clonk owners,
no reason Clonk Endeavour owners shouldn't get it as well.
2010-10-10 17:44:26 +02:00
Günther Brammer 25d74134c7 Support subpixel object movement in the editor
This also converts internal usage of ForcePosition to C4Real. For the
attach procedure, this should only result in smoother movements, but the
consequences for flight are less clear.
2010-10-10 18:46:23 +02:00
Günther Brammer ecf6fa550e Move viewport to landscape coordinates translation to common code
I should have done this two years ago when introducing zoom. Sorry for the
bug this has caused.
2010-10-10 18:45:00 +02:00
Günther Brammer 8723dc9fbd Change the update mechanism to load an URL based on the current version
Also open the download page in a browser when the update package download
fails.
2010-10-10 18:43:22 +02:00
Günther Brammer 16609432cb Remove Regjoinonly flag, unregistered users can now join all games
The commandline option already went away anyway.
2010-10-04 18:07:46 +02:00
Nicolas Hake 58e0e4b14d Lessen rounding errors when moving objects in zoomed editor window 2010-10-07 01:11:52 +02:00
Peewee 3f11e47642 win32: Fix incorrect EditCursor offset (#81) 2010-10-06 18:34:19 -04:00
Nicolas Hake a0130e0389 Add getopt third party library
Some build systems, particularly MSVC, don't ship with an implementation
of getopt or getopt_long in their standard library. This patch adds a BSD
licensed implementation, to be used in case there is no system provided
one.
2010-10-05 00:14:07 +02:00
Günther Brammer 9bf3288c77 Rewrite ParseCommandLine to work on argc/argv instead of a single string
Using the standard utility function on windows to split the line and the
operating system provided argc/argv on the others.

Also move the function to C4Application. It's not a huge win because the
flags are spread out between C4Game and C4Application pretty evenly, but
eventually most of them should move to a more appropriate place.
2010-10-04 21:39:19 +02:00
Günther Brammer b8f8efa2d7 Move C4GraphicsSystem::SetGamma and friends to CStdDDraw 2010-10-01 23:36:48 +02:00
Tobias Zwick e0cb527c5d removed Score.png from resources 2010-10-03 14:31:26 +02:00
Tobias Zwick cbe501596f remove hardcoded definitions for CR Western.c4f 2010-10-03 13:30:36 +02:00
Armin Burgmeier 1faab34df7 Fix MinGW build 2010-10-03 12:15:19 +02:00
Nicolas Hake 2df81a55d1 Clarify a calculation 2010-10-02 19:02:21 +02:00
Nicolas Hake 75a723ec8b fmod: Fixed incorrect sample length calculation (#437)
The crash was caused by an incorrect integer division in the sound
loader that was supposed to be a double division. Sounds shorter than
a second were reported to have zero length because of this, leading
to a division by zero in the playback code.
2010-10-02 18:48:43 +02:00
Peewee 854483bf27 Changed SimFlight behavior
SimFlight now returns the array [x, y, xdir, ydir, steps_taken] instead
of trying to modify parameters.To preserve old functionality, steps_taken
will be negative if it doesn't hit anything before time runs out.
2010-10-01 20:30:59 -04:00
Günther Brammer 2aa2712bfc Move C4GraphicsSystem::MouseMove to C4GUI::Screen
The function mostly operated on C4GUI::Screen anyway.
2010-09-29 23:58:59 +02:00
Günther Brammer d9dc994f8c Remove some forgotten global variables 2010-09-29 03:57:35 +02:00
Günther Brammer 93a1e82907 Split out viewport stuff from C4GraphicsSystem to a new C4ViewportList 2010-09-29 03:44:05 +02:00
Günther Brammer 9f0ba09c04 Split C4Viewportwindow out of C4Viewport.h/cpp 2010-09-28 21:29:00 +02:00
Günther Brammer 8e2ae2f543 Replace Application.DDraw with lpDDraw everywhere
There's no need for two globals always storing the same value.
2010-09-28 20:35:26 +02:00
Günther Brammer a7e4dd9a9c Rename some fullscreen flags to editor 2010-09-28 20:16:33 +02:00
Günther Brammer ccbfa225bf Remove the switch-to-editor function, there is no separate editor anymore 2010-09-28 19:22:39 +02:00
Günther Brammer c4a5039561 Move the last remnants of CDDrawCfg to Config.Graphics 2010-09-28 19:07:47 +02:00
Nicolas Hake 4a1a9cc2b0 msvc: Avoid a stupid warning 2010-09-29 23:19:43 +02:00
Nicolas Hake bfd803bd54 cmake: Remove useless NULL_IS_NULLPTR_T check 2010-09-29 23:14:08 +02:00
Martin Plicht 37703d7ae6 Mac: Add FSEvents implementation of C4FileMonitor 2010-09-29 00:17:56 +02:00
Nicolas Hake 780873c25f fmod: fix memleak in error path of soundloader
When the FMOD sound loader is unable to get the frequency of a loaded
sample, the sample was not freed, leading to a memory leak.
2010-09-28 23:50:31 +02:00
Nicolas Hake d89857de86 Fix FMOD sound loader 2010-09-28 04:54:35 +02:00
Martin Plicht 243e20bdf6 Add OpenAL implementation of C4SoundSystem
With an Ogg Vorbis loader using libvorbis and a .wav loader using a macosx
API.

Günther: Add autotools support
2010-09-26 02:36:35 +02:00
Günther Brammer 90f3b394a8 Object Draw: Fix parallax object positions when zoomed
Previously, the object position was used as if it represented the position
in the landscape when viewed from 0/0 with the current Zoom, but it
actually represents the position when viewed from 0/0 with Zoom 1.
2010-09-26 20:46:13 +02:00
Günther Brammer bdf65ae34e Keep the view in the center of the viewport when changinge Zoom, again 2010-09-25 22:53:55 +02:00
Günther Brammer b9345fbf96 Object Draw: Fix editcursor interaction with Zoom 2010-09-25 22:54:27 +02:00
Günther Brammer e6ad5d3bd4 Object Draw: Really fix message display 2010-09-25 22:52:43 +02:00
Armin Burgmeier 98301c0a48 Fix crash when playing animation with zero length (#340) 2010-09-25 13:51:45 +02:00
Günther Brammer 0adf54073d Object Draw: Also correctly position messages of parallax objects with zoom 2010-09-24 21:22:57 +02:00
Günther Brammer 17016a6695 Version: Reduce version number from five numbers to four
Removing C4XVER4 and renaming C4VERBUILD to C4XVER4. Also, make the
Makefile.am read the version from the Version.txt and generate C4Version.h.
2010-09-25 00:43:30 +02:00
Tobias Zwick d11a4f92ec fix msvc build 2010-09-24 20:23:27 +02:00
Nicolas Hake d05a5ec9f5 msvc: Build fix 2010-09-24 20:38:02 +02:00
Nicolas Hake d99f558d72 win32/gl: Disable devmode material preview (#406)
The preview was broken anyway, since it rendered to the main
window of dev mode instead of the preview widget inside the
tool dialog. It has been disabled to avoid graphics corruption
on the main window.
2010-09-24 20:23:42 +02:00
Armin Burgmeier e7eaada8e3 Fix scrolling borders for zoomed viewport (#155) 2010-09-24 19:52:20 +02:00
Günther Brammer 3dde77508a Object Draw: Account for parallaxity when zooming
Also zoom a parallax sky correctly.
2010-09-24 19:51:34 +02:00
Günther Brammer 5dc10647e2 C4TargetFacet now also stores the Zoom factor 2010-09-24 20:17:07 +02:00
Günther Brammer 68d868f3ba Object Draw: Factorize calculation of position on screen into one function 2010-09-23 03:51:08 +02:00
Günther Brammer d3836b72b6 Object Draw: Remove redundant cox/coy variables 2010-09-24 02:35:26 +02:00
Günther Brammer 93d3bc7d2f Script: Thaw and clean definition proplists for reload (#405) 2010-09-22 03:33:57 +02:00
Günther Brammer 7d3811fc76 Script: Arrays do not autoextend when accessed
Done by constifying the C4ValueList interface. To avoid rewriting some code that
uses that interface, also constify some C4Value functions. While at it,
replace the dynamic function call for C4Value conversion with a switch.

This makes C4Value conversion not actually convert anything, but the only
case left is conversion to bool, which already occurs when the value is
read.
2010-09-20 19:49:00 +02:00
Armin Burgmeier bd2f63bf1d Add an option to build against GTK+ 3 2010-09-22 17:11:19 +02:00
Armin Burgmeier 479362b87c Fix a crash bug on 64 bit 2010-09-22 02:14:16 +02:00
Julius Michaelis 4a55192db8 Added a search field to the network games list 2010-09-19 19:01:31 +02:00
Julius Michaelis c80fcf1a62 correct out of screen coordinates for console windows (#288) 2010-09-17 14:07:12 +02:00
Dominik Bayerl 88946a8f10 Fix viewport flickering 2010-09-19 17:39:00 +02:00
Julius Michaelis dcd3065243 add #openclonk* to allowed IRC-client channels (#381)
change default channel to #openclonk-lobby
2010-09-16 23:22:38 +02:00
Armin Burgmeier ba3308d1c6 Fix initialization order in C4Value constructors 2010-09-15 21:23:02 +02:00
Armin Burgmeier d1dcffc86b Animation mirroring: Mirror all bones, not just .R and .L ones (#402)
Except those ending on .N
2010-09-14 00:18:25 +02:00
Günther Brammer f1e27ca7db Script: a[0:GetLength(a)-1] returns a copy of the array
Previously, returning the same array was an optimization that could not be
noticed from script, because arrays were copied on write.
After noref, this caused a big difference between a[0:] and a[1:], which is
bad.
2010-09-12 18:27:09 +02:00
Tobias Zwick 419b12a5e4 removed possible crash 2010-09-12 16:03:49 +02:00
Tobias Zwick 2a6e2cbc89 added callback OnMaterialChanged (#217) 2010-09-12 15:04:16 +02:00
Günther Brammer cf92ceae2d Merge branch 'norefs'
Conflicts:
	planet/Melees.c4f/Ruins.c4s/ObjectFade.c4d/Script.c
	planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/Script.c
	planet/Objects.c4d/Goals.c4d/LastManStanding.c4d/Relaunch.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/BlackPowder.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Coal.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Earth.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Firestone.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Gold.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Ice.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Loam.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Metal.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Ore.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Rock.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Snow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Sulphur.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Wood.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Axe.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Balloon.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Barrel.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Boompack.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/PowerLine.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Dynamite.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Fuse.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Igniter.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Hook.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Rope.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Hammer.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/JarOfWinds.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/OrbOfTelekinesis.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Pickaxe.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/PowderKeg.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/LadderGrabber.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/LadderSegment.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Shovel.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Club.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Javelin.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Ammo.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Shield.c4d/Script.c
	planet/Objects.c4d/Vehicles.c4d/Cannon.c4d/Script.c
	planet/Objects.c4d/Vehicles.c4d/Lorry.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Flag.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/MenuDeco.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/TutGuide.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/TutorialGoal.c4d/Script.c
	planet/Tutorial.c4f/Tutorial03.c4s/ShootTheTargets.c4d/Script.c
	src/game/object/C4Def.h
2010-09-11 19:30:45 +02:00
Günther Brammer efad172ec6 Script: Compare readonly proplists by their contents
This way, breaking the identity relationship on savegame load will not be
noticable by script.
2010-09-10 23:01:30 +02:00
Günther Brammer 64f424cc51 Script: Add | operator to constants
This is the only operator that is necessary for the ActMaps. Ideally, every
operator would work, but I don't know how to achieve that without massive
code duplication. So just duplicate a little to make it work.
2010-09-09 22:41:41 +02:00
Armin Burgmeier 5819c34211 Create a mirror animation for each animation ending on .R or .L (#401) 2010-09-09 22:40:07 +02:00
Günther Brammer 153646b3d7 Script: Move Action initialization to script, make it static const
Finally. :-)
2010-09-09 22:38:25 +02:00
Armin Burgmeier 8f0af13a62 Fix a crash when opening a player viewport in developer mode 2010-09-09 22:38:18 +02:00
Günther Brammer b55c88d486 Script: Add initialization to local named variables (properties) 2010-09-09 22:36:00 +02:00
Günther Brammer 008df08d65 Script: Fix creation of objects deriving indirectly from definitions
Before, CreateObject({Prototype=Clonk, Name=Superclonk}) would create a
Clonk, not a Superclonk.
2010-09-09 01:18:43 +02:00
Günther Brammer ef76b26c4a Script: Save readonly proplists inline so that they do not need a number 2010-09-08 20:09:27 +02:00
Günther Brammer 6d3fc6032b Remove the last traces of the Strings.txt 2010-09-08 20:08:13 +02:00
Günther Brammer bf9137149c Script: Initial proplists are readonly at runtime
That way, recreating them from game data during savegame load won't
suddenly revert changes, because there aren't any changes.
2010-09-08 14:54:39 +02:00
Günther Brammer 1a3f8fe80b Script: Make a[-n]=foo work
Before, negative indices would alias to 0, which is not helpful.
2010-09-08 00:41:59 +02:00
Günther Brammer 984c3430ac Script: constants can contain proplists and arrays
Only supporting the literal syntax for them, with the same
constraints for the contents as for toplevel constants.
2010-09-09 02:18:19 +02:00
Günther Brammer 275e9dfd7d Script: Revise error messages for uniformity
All messages end with a . now, don't quote c4value types and call the i in
a[i] "index".
2010-09-08 00:46:01 +02:00
Günther Brammer 9646d94757 Remove a disguised OSTR instance 2010-09-07 01:58:31 +02:00
Sven Eberhardt 9400a28c1f Implement zoom limits (#175)
Script interface for setting zoom and zoom limits based on viewport size (SetPlayerZoomByViewRange)
Script interface to lock player from scrolling (GetPlayerViewLock)
2010-09-08 23:49:42 +02:00
Armin Burgmeier 8251dad78b Apply zoom to SolidMask display (#370) 2010-09-07 17:00:27 +02:00
Tobias Zwick 0a0d8ce0b2 new icon #2 2010-09-06 19:14:28 +02:00
Tobias Zwick bf6613c191 updated OC icon 2010-09-04 23:58:24 +02:00
Nicolas Hake b35bc19885 msvc: Help disambiguate pow() calls 2010-09-06 00:49:51 +02:00
Armin Burgmeier 521a2baf7d Make zoom speed depend on distance of current zoom to target zoom 2010-09-05 20:37:13 +02:00
Nicolas Hake 3f1b1cb6f1 win32/opengl: Restore resolution on task switch from fullscreen mode 2010-09-05 15:07:45 +02:00
Nicolas Hake ee04eefec8 Replaced invalid string manipulation
Per 21.4.5, access to the null-terminator returned by
std::basic_string::operator[] if the requested element is equal to
the container's size must be read-only.
2010-09-05 14:18:55 +02:00