Commit Graph

1956 Commits (a619b4b6eddc02e888e2bb4cb5913bbd9a6c2f89)

Author SHA1 Message Date
Nicolas Hake a619b4b6ed c4group: Fix incorrect swprintf usage 2013-01-11 23:41:58 +01:00
Tobias Zwick d0a6bb099f fix #792: wouldn't load Overlay.*.png 2013-01-08 23:52:45 +01:00
Günther Brammer 08f86c2038 Script: continue in a do-while loop jumps to test instead of start of loop
This matches C and other languages.
2013-01-08 21:21:11 +01:00
Günther Brammer 41c88ba863 Use _snwprintf instead of swprintf
Apparently the C standard committee and Microsoft couldn't agree on how
swprintf should work.
We previously tried to work around the resulting breakage, but I just got
the following compilation error. It's really better to avoid that function
entirely. Since we only used it in windows-specific code, the
windows-specific _snwprintf is a nicely compiler-independent replacement.

src/platform/PlatformAbstraction.h: In function ‘int swprintf(wchar_t*, size_t, const wchar_t*, ...)’:
src/platform/PlatformAbstraction.h:243:12: error: redefinition of ‘int swprintf(wchar_t*, size_t, const wchar_t*, ...)’
/usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/swprintf.inl:30:5: error: ‘int swprintf(wchar_t*, size_t, const wchar_t*, ...)’ previously defined here
2012-12-31 22:03:12 +01:00
Günther Brammer 6e4b5bd0ca Don't crash on Call() 2012-12-31 22:03:12 +01:00
Günther Brammer 2d05c9501c Make StdSync.h compile with neither windows nor pthreads again 2012-12-31 22:03:12 +01:00
Günther Brammer d5c1cb8c51 Remove some unused variables 2012-12-31 22:03:12 +01:00
Günther Brammer 6a6190564f Remove some forward declarations that are already in C4Prototypes.h 2012-12-31 22:03:12 +01:00
Sven Eberhardt 6e85a7a5fc Fix SolidMasks not moving objects if the top left of the landscape was solid
A missing fixed conversion let the shape check happen at or around position 1/1 instead of at the actual object position.

Also removed a redundant contact check.
2012-12-31 15:56:02 +01:00
Armin Burgmeier c3c148d53a Add CreateParticleAtBone script function 2012-12-29 00:06:30 +01:00
Armin Burgmeier 84c43f9a1d Draw particles with subpixel precision 2012-12-28 19:28:39 +01:00
Armin Burgmeier e03c980038 Linux: Fix a crash when no primary output is specified 2012-12-28 17:32:12 +01:00
Nicolas Hake 3c9198876c Win32: Mark OC "DPI aware" (#891)
Technically this mark is incorrect; we do not handle things differently
on high DPI settings. On the other hand, marking OC DPI aware means that
Windows won't try to scale our drawing, clipping menus and rendering in
the process.

Somewhere in the future, OpenClonk should also add proper DPI awareness
and change the default zoom and menu scaling to match.
2012-12-24 14:44:41 +01:00
David Dormagen 8f2058e55b adjusted PathFree2 to return the first point on the line from point1 to point2
before, when point1 was f.e. more to the right, PathFree2 would swap the points and return an unexpected point
2012-12-22 16:48:50 +01:00
Sven Eberhardt 16d4258b09 Added some array sorting functions to C4Script 2012-12-17 16:41:39 +01:00
Sven Eberhardt 548413449d fix material conversion on insertion into converting liquid 2012-12-16 18:52:32 +01:00
Sven Eberhardt 86b20be644 Fix C4Command::Jump, i.e. jumping as part of pathfinder. 2012-12-09 18:44:22 +01:00
Sven Eberhardt 6a4e5b0615 Attached objects with SolidMask (slave elevator case) can carry objects 2012-12-06 20:30:35 +01:00
Sven Eberhardt 7a042ecca5 Do not allow debugger connections in league games.
We do not have a league yet and once we do, people might start cheating with customized engines. But at least it shouldn't be that easy.
2012-12-06 17:18:43 +01:00
Armin Burgmeier dfdd0fba3e Remove debug logs in X11 gamma ramp code 2012-12-02 15:52:29 +01:00
Armin Burgmeier 55b2a15d15 SaveDefaultGammaRamp: Return true if everything worked correctly 2012-12-02 15:52:13 +01:00
Armin Burgmeier fab541798f SaveDefaultGammaRamp: Don't crash if primary output is not connected
Instead, use the first connected output from the list of all outputs.
This happens on my computer, probably because the desktop environment
does not set the correct primary output.
2012-12-02 15:51:06 +01:00
Armin Burgmeier e8a4628d6a Fix xrandr version check for gamma ramp modification 2012-12-02 15:10:27 +01:00
Armin Burgmeier 0556bd6cd7 Initialize all variables in C4X11AppImpl 2012-12-02 15:09:44 +01:00
Günther Brammer 8cfd88f0d2 Make dedicated server compile with fmod 2012-11-30 22:20:16 +01:00
Günther Brammer 327bfa31e7 Remove some superflouos output from the dedicated server 2012-11-30 22:20:16 +01:00
Günther Brammer d9c3c1d713 The dedicated server command line can now start a scenario
I don't know how useful that is without control over other options, but at
least its something instead of nothing.
2012-11-30 22:20:16 +01:00
Günther Brammer a1589a48b6 Make network lobby command line processing available to the editor and dedi
Most of the processing was already done by C4MessageInput::ProcessInput and
C4MessageInput::ProcessCommand. Simply move the Lobby-only commands there,
too, and make them work without a Lobby MainDlg. This required almost only
cosmetic changes.
2012-11-30 22:20:15 +01:00
Günther Brammer b5ae4f1f9d Move CStdInProc to its own source file
It should be usable without USE_CONSOLE, even though only the dedicated server
uses it at the moment.
2012-11-30 22:18:38 +01:00
Günther Brammer f13df38ec1 update: Log an error message when extracting the update program fails 2012-11-19 22:45:19 +01:00
Günther Brammer cb74726158 Fix some BSD portability issues
Thanks to mdg on the forum and the Debian buildd.
2012-11-19 17:23:31 +01:00
Günther Brammer 069b36a1bd X11: Finish xf86vidmode removal 2012-11-18 01:07:59 +01:00
Günther Brammer 7967d94a59 Merge StdFont.cpp and C4Fonts.cpp 2012-11-12 02:30:16 +01:00
Günther Brammer 4dffefe8c9 X11: Remove support for the xf86vidmode extension
In practice, only the xrandr code path received any testing. Since Clonk
works fine without changing the resolution, this will not terribly
inconvenience anybody still stuck on old systems without xrandr.

Also only minimize the window when the resolution was changed.
The minimization is there to prevent accidental focus restoration
resulting in unwanted resolution switching.
2012-11-17 18:07:37 +01:00
Günther Brammer 8a001972ab Avoid some false positives on a naive Random-between-sequence-points check
The check was git grep -Ewn -e 'Random\s*\([^;{}]+Random' src
2012-11-17 16:30:12 +01:00
Günther Brammer c439c81362 Remove unused C4D_None 2012-11-12 02:41:20 +01:00
Nicolas Hake 102ac08c2e Don't assume char to be unsigned when generating packet header
OR'ing an enum value and a char with its highest bit set sign-extends the char.
On compilers with signed chars, this means you end up with a negative integer,
which can't be narrowed to uint8_t at initialization (which is what PacketHdr's
first member is).
2012-11-17 22:53:56 +01:00
Sven Eberhardt 99992b6f47 Fix sync loss and missing landscape or objects when joining two consecutive games without restarting the engine inbetween
Caused by an outdated cache of the DirectoryIterator in the main scenario group
2012-11-17 19:44:04 +01:00
Peter Wortmann afe653baae Use uint8_t consistently for UDP status packet byte
Thanks to pkern for spotting this.
2012-11-17 17:40:00 +00:00
Tobias Zwick 348fb8c7a9 clean up mouse controls, reduced cursor graphics to the used ones 2012-11-16 17:29:42 +01:00
Günther Brammer 95de10f6a8 editor: Fix USE_CONSOLE 2012-11-16 00:05:58 +01:00
Günther Brammer a8dfeeaf7e win32: Make USE_CONSOLE compile again
There's even a plausible implementation of CStdInProc::GetEvent.
2012-11-15 23:01:24 +01:00
Günther Brammer af62ab7931 Move script bytecode from C4ScriptHost into C4AulScriptFunc
This makes functions independent of their "Code Owner"s, which removes the
necessity to maintain that connection and carefully reset functions when
their scripthost is cleared.
2012-10-21 18:14:32 +02:00
Peter Wortmann 2c821552e5 Reset default material zoom level to 4
Due to popular demand
2012-11-07 22:14:07 +00:00
Peter Wortmann cc6d138133 Fixed CompileFunc entry for MaterialZoom
oops.
2012-11-05 19:16:33 +00:00
Peter Wortmann 95ad163c29 Fixed warning 2012-11-05 17:17:51 +00:00
Peter Wortmann a4b4065206 Made material zoom configurable
Also set default to 8. This might be a pretty controversial change, but
the amounts of screenshots we have at zoom levels beyond 4 just calls for
a more high-res approach.
2012-11-05 17:17:12 +00:00
Peter Wortmann 41b51907c6 Officially make BROKEN_ARRAYS_WORKAROUND the default
Pretty awkward compromise, but the array version seems to confuse a lot of
drivers, without causing an actual error. So this is probably better in
practice until better drivers are more common.
2012-11-05 16:57:33 +00:00
Günther Brammer cd147525eb Script: Warn when redefining a global constant 2012-10-23 02:05:33 +02:00
Günther Brammer e0aa23c8ba Rename C4PropList::NewAnon to C4PropList::NewStatic
"Anon" referred to the fact that these proplists have neither a number,
like simple proplists, objects and effects, nor an ID like Definitions.

However, they now store the names of the global constant or property they
are in, so "Anon" is no longer appropriate.

There are now three classes of proplists:
- ordinary proplists (C4PropListScript) have a number only in the savegame
- objects and effects (C4PropListNumbered) always have a number
- proplists created during initialization (C4PropListStatic) have a path

So the function could be called NewNamed, but the source of the proplist
has been far more stable than the method used for serialization, and Static
somewhat describes the source.
2012-08-15 19:43:02 +02:00