Holger Schemel [Thu, 30 May 2019 18:38:04 +0000 (20:38 +0200)]
fixed bug with resetting variable which may already be set
Holger Schemel [Thu, 30 May 2019 18:06:44 +0000 (20:06 +0200)]
renamed variable (old name did not describe its use anymore)
Holger Schemel [Tue, 28 May 2019 17:42:54 +0000 (19:42 +0200)]
fixed detecting running animations ('restart' bit may also be set)
Holger Schemel [Sat, 25 May 2019 12:39:03 +0000 (14:39 +0200)]
fixed initially displaying custom mouse cursor in upper left corner
Holger Schemel [Sat, 25 May 2019 11:42:42 +0000 (13:42 +0200)]
added new option "create_user_levelset" (setup file only)
Setting this option to "false" (in a global program setup file)
prevents the creation of a new, empty user level set at the first
start of the program.
This option was specifically created for the R'n'D special edition
"R'n'D jue II", which comes with pre-defined user level sets.
Holger Schemel [Sat, 25 May 2019 11:23:06 +0000 (13:23 +0200)]
version number set to 4.1.3.1
Holger Schemel [Sat, 25 May 2019 09:10:56 +0000 (11:10 +0200)]
added using new screen fading option ".auto_delay_unit"
Holger Schemel [Fri, 24 May 2019 18:46:20 +0000 (20:46 +0200)]
added new screen fading option ".auto_delay_unit" (currently not used)
This new option will be used to be able to configure the existing
option ".auto_delay" (the time delay after which a title screen will
be automatically faded to the next screen) to use video frames instead
of milliseconds. This can be useful to synchronize global animations
on title screens with the automatic screen fade delay (which may be
inaccurate if using milliseconds for fading, while global animations
always use video frames for configuring animation delay).
Holger Schemel [Fri, 24 May 2019 18:16:22 +0000 (20:16 +0200)]
added video frame counter (currently not used)
Holger Schemel [Mon, 20 May 2019 16:43:24 +0000 (18:43 +0200)]
version number set to 4.1.3.0
Holger Schemel [Sun, 28 Apr 2019 18:25:17 +0000 (20:25 +0200)]
fixed handling clickable global animations during request dialog
Holger Schemel [Thu, 25 Apr 2019 17:46:06 +0000 (19:46 +0200)]
added handling global animations during delays in Mirror Magic game engine
Holger Schemel [Thu, 25 Apr 2019 17:37:00 +0000 (19:37 +0200)]
added handling global animations when showing envelope during tape replay
Holger Schemel [Thu, 25 Apr 2019 17:25:19 +0000 (19:25 +0200)]
added handling clickable global animations during request dialog
Holger Schemel [Thu, 25 Apr 2019 17:06:11 +0000 (19:06 +0200)]
fixed bug with restarting pointer-style global animations when moving mouse
Holger Schemel [Thu, 25 Apr 2019 16:51:31 +0000 (18:51 +0200)]
fixed (reversed) setting hot spot for pointer-style global animations
Holger Schemel [Wed, 24 Apr 2019 18:11:18 +0000 (20:11 +0200)]
added not using global animation mouse pointer when reloading artwork
Holger Schemel [Wed, 24 Apr 2019 17:31:45 +0000 (19:31 +0200)]
added setting draw order and style for pointer-style global animations
To ensure pointer-like behavior for pointer-style global animations,
set draw order to high value (if draw order has default value) to be
on top of all other animations and set style to pass-through clicks
(if style has default value) to handle mouse clicks under the pointer
animation.
Holger Schemel [Mon, 22 Apr 2019 11:08:40 +0000 (13:08 +0200)]
added forcing pointer-style global animations to stay inside window area
Holger Schemel [Mon, 22 Apr 2019 10:47:58 +0000 (12:47 +0200)]
added pumping events when waiting for screen redraw
This is required for executing event filter to update mouse position
during actions without event handling (like fading screens).
Holger Schemel [Mon, 22 Apr 2019 08:41:25 +0000 (10:41 +0200)]
fixed handling global animation click events
When handling global animation click events, it may happen that more
than one click event occurs within the same game frame (especially
when doing a click by tapping on a touch pad or screen, which may lead
to a "press" and "release" event within the same game frame).
Before, only the first click event was correctly handled (as the event
was not directly handled, but stored and processed later in the screen
redraw phase, when global animations are handled), while all following
events (that occurred within the same game frame) are usually lost if
they should be processed for the next part of the animation (which is
not active before the first event was processed).
Example: Global animation for a button that will be shown as "pressed"
after handling a "click" event and that will be shown as "unpressed"
again after handling a "release" event. If the "click" and "release"
events occur within the same game frame, the global animation still is
in the "unpressed" animation part when the "release" event is handled,
so it will be ignored and the button will stay in the "pressed" state.
To fix this buggy behavior, click (and release) events are now handled
immediately after they occur (instead of processing them in the screen
redraw phase), which results in changing the animation's active part
directly after the event occured, so the next event can be processed
by the next part of the animation.
Holger Schemel [Sat, 20 Apr 2019 08:55:13 +0000 (10:55 +0200)]
fixed handling "Escape" key on high score screen
Before, pressing the "Escape" key on the high score screen after
solving a level when using the game setting "auto-play next level"
started playing the next level.
Now, only "positive" input actions (like pressing "Space" or "Enter"
or pressing a joystick button) start playing the next level, while a
"negative" input action like pressing the "Escape" key always returns
to the main menu even with this game setting activated.
Holger Schemel [Thu, 18 Apr 2019 23:04:35 +0000 (01:04 +0200)]
fixed function to always return a string copy (and never a string constant)
Holger Schemel [Wed, 17 Apr 2019 20:18:23 +0000 (22:18 +0200)]
fixed some memory allocations to prevent valgrind warnings
Holger Schemel [Wed, 17 Apr 2019 20:02:18 +0000 (22:02 +0200)]
fixed some memory allocations to prevent valgrind warnings
Holger Schemel [Thu, 4 Apr 2019 22:00:53 +0000 (00:00 +0200)]
added function to update the mouse position when changing window size
Holger Schemel [Thu, 4 Apr 2019 21:15:20 +0000 (23:15 +0200)]
added SDL event filter to track mouse position from mouse motion events
This (re-)adds a mouse motion event filter to update the current mouse
position for "pointer" class global animations, even if no events were
handled before, which improves smoothness of mouse pointer movement.
Holger Schemel [Wed, 3 Apr 2019 17:22:26 +0000 (19:22 +0200)]
improved global animation class "pointer" for animation at mouse position
When using this animation class, the "real" mouse pointer is made
invisible now.
Holger Schemel [Sat, 23 Mar 2019 21:58:54 +0000 (22:58 +0100)]
added global animation actions executed after init/anim/post delay
This change adds the following new options for global animations:
* .init_delay_action
* .anim_delay_action
* .post_delay_action
They can be set to the same values as ".init_event_action" and
".anim_event_action" (buttons, gadgets and key actions).
Holger Schemel [Sat, 23 Mar 2019 21:18:10 +0000 (22:18 +0100)]
renamed variable
Holger Schemel [Sat, 23 Mar 2019 21:16:37 +0000 (22:16 +0100)]
fixed bug with not recognizing ".init_event_action" for global animations
Holger Schemel [Thu, 21 Mar 2019 23:30:15 +0000 (00:30 +0100)]
fixed initializing post delay counter when starting global animation
Holger Schemel [Thu, 21 Mar 2019 23:05:57 +0000 (00:05 +0100)]
fixed inconsistent global animation state after event actions
When executing event actions for global animations, these actions may
cause a screen change, which itself may change the state of global
animations (especially stopping animations that were running on the
previous screen).
When executing event actions directly from the functions that handle
global animations, these functions may continue changing the state of
the global animation that caused the event action, even though this
animation was already stopped due to a screen change, which may cause
this animation to be set back to "active" ("running") state, so that
it continues being displayed on the new screen, even though it was
never defined for it.
This problem was fixed by executing all event actions independently
from the animation handling functions, by inserting new user events
into the program's standard event queue, to handle animation event
actions in a separate, independent step after all animations were
handled.
Holger Schemel [Thu, 21 Mar 2019 22:36:36 +0000 (23:36 +0100)]
fixed handling global animation key event actions multiple times
When checking key events for triggering global animations, all keys
that are not handled as "click" events for the "any" animation event
were effectively treated like a "released button" event, which did
not have an effect if no mouse button was pressed at the same time.
However, when clicking on "clickable" global animations (those that
have a "click" animation event defined) with key event actions (that
will cause a simulated key press and release event), any key press
event that is not recognized as a "click" event will again be treated
like a "released button" event, causing the "button is pressed" state
in "HandleGlobalAnimClicks()" to be changed to "not pressed anymore",
so the still pressed mouse button will cause another "press event" in
"HandleGlobalAnimClicks()" right away, which will result in multiple
key events instead of one single key event. This may cause unexpected
and unwanted behaviour when handling global animation events.
This problem is fixed by only handling those key events for global
animations that will be handled as "click" events.
Holger Schemel [Thu, 21 Mar 2019 08:17:57 +0000 (09:17 +0100)]
added generic support for handling user events
Holger Schemel [Wed, 20 Mar 2019 21:00:34 +0000 (22:00 +0100)]
cleanup of obsolete client message event from SDL 1.2
This event is only used for the "quit" event in SDL 2.0 now.
Holger Schemel [Wed, 20 Mar 2019 20:50:38 +0000 (21:50 +0100)]
removed obsolete window events from SDL 1.2
These obsolete window events were used for SDL 1.2 support (which was
removed some time ago) and are not needed anymore. All corresponding
window events are handled by SDL_WINDOWEVENT in SDL 2.0 now.
Holger Schemel [Wed, 20 Mar 2019 18:18:54 +0000 (19:18 +0100)]
fixed handling global animation key actions when mouse button is pressed
When handling key actions for global animations (like pressing "Enter"
or "Escape") which are translated into global animation click events,
they were ignored if a "real" mouse button is already held pressed at
the same time. This can especially happen with animation event actions
that simulate key press events when clicking on global animations, so
the key actions were ignored if the mouse button was held down for too
long.
This change forces key actions of global animations to be handled even
if a mouse button was pressed at the same time.
Holger Schemel [Mon, 18 Mar 2019 22:57:46 +0000 (23:57 +0100)]
added global animation class "pointer" for animation at mouse position
The animation's x and y position values are used to set the animation
position relative to the mouse pointer position when using this class.
Holger Schemel [Mon, 18 Mar 2019 22:53:08 +0000 (23:53 +0100)]
added fields to graphics info structure to store current mouse position
Holger Schemel [Sun, 17 Mar 2019 19:20:51 +0000 (20:20 +0100)]
added global animation event 'unclick:any' to handle mouse release events
Holger Schemel [Sat, 16 Mar 2019 20:50:49 +0000 (21:50 +0100)]
fixed wrong position of global animations in 'door_2' in level editor
Holger Schemel [Sat, 16 Mar 2019 10:05:05 +0000 (11:05 +0100)]
minor code formatting changes
Holger Schemel [Sat, 16 Mar 2019 10:01:19 +0000 (11:01 +0100)]
fixed handling key event actions by global animations in level editor
Holger Schemel [Thu, 14 Mar 2019 07:35:00 +0000 (08:35 +0100)]
added some more debug output for triggered global animations
Holger Schemel [Thu, 14 Mar 2019 01:15:36 +0000 (02:15 +0100)]
added several new event types that can trigger global animations
This change adds the following new global animations event types,
which can be used like the already existing "click:anim_X.part_Y":
* init:anim_X.part_Y - triggers when animation is initialized
* start:anim_X.part_Y - triggers when animation is started
* end:anim_X.part_Y - triggers when animation ends
* post:anim_X.part_Y - triggers when animation post delay ends
The second part ".part_Y" is optional; if missing, events for every
animation part will trigger the animation for which this event is
defined.
The "init" event will trigger even if the animation is not yet
displayed, but starts waiting for its "init_delay" or "init_event",
while the "start" event will trigger when the first frame of the
animation is displayed.
The "end" event will trigger when the last frame of the animation is
displayed (either because the animation has stopped due to a click
event, due to the "anim_delay" being finished or because the animation
has completely moved off the screen), while the "post" event will
trigger when the "post_delay" is completely finished.
Holger Schemel [Thu, 14 Mar 2019 01:01:49 +0000 (02:01 +0100)]
added some debug output for triggered global animations (deactivated)
Holger Schemel [Thu, 14 Mar 2019 00:55:36 +0000 (01:55 +0100)]
added support for more event types that can trigger global animations
Holger Schemel [Thu, 14 Mar 2019 00:38:49 +0000 (01:38 +0100)]
moved checking if click triggered other animations to separate function
Holger Schemel [Wed, 13 Mar 2019 19:25:02 +0000 (20:25 +0100)]
added support for more event types for global animations (yet to be added)
Holger Schemel [Tue, 12 Mar 2019 22:08:53 +0000 (23:08 +0100)]
added support for handling multiple event definitions for global animations
Holger Schemel [Tue, 12 Mar 2019 21:14:13 +0000 (22:14 +0100)]
cleanup of (boolean) animation event state handling
Holger Schemel [Tue, 12 Mar 2019 20:22:02 +0000 (21:22 +0100)]
added support for storing multiple event definitions for global animations
Holger Schemel [Tue, 12 Mar 2019 07:24:18 +0000 (08:24 +0100)]
moved functions to parse GIC parameters from 'libgame' to main source tree
Holger Schemel [Thu, 7 Mar 2019 07:30:00 +0000 (08:30 +0100)]
fixed a few element token names (previously set to 'char_unused')
Holger Schemel [Wed, 6 Mar 2019 19:22:34 +0000 (20:22 +0100)]
fixed editor graphic of element "steel_char_space" (now visually different)
Holger Schemel [Tue, 5 Mar 2019 23:12:21 +0000 (00:12 +0100)]
changed some level editor graphic definitions to use in-game graphics
The old definitions still came from a time where downscaled graphics
did not use interpolation and therefore did not look well with those
graphics also used in-game.
Holger Schemel [Tue, 5 Mar 2019 22:53:12 +0000 (23:53 +0100)]
fixed creating level sketch images for DF/MM elements and for SQL statements
Holger Schemel [Sun, 3 Mar 2019 17:08:35 +0000 (18:08 +0100)]
added cycling through all zoom tilesizes in editor when using touch device
Holger Schemel [Sun, 3 Mar 2019 17:06:40 +0000 (18:06 +0100)]
added detecting use of touch device for user input on current platform
Holger Schemel [Wed, 27 Feb 2019 21:35:32 +0000 (22:35 +0100)]
fixed graphical bugs caused by commit
f77bbb8f and
1b4dc759
Each of these two commits exactly do the reverse of the other commit,
both still resulting in graphical bugs (that the corresponding other
commit fixes).
This change should fix both problems, resulting in (a) playfield not
flashing black when game started from level editor and (b) different
global borders when playing from level editor being correctly drawn.
Holger Schemel [Wed, 27 Feb 2019 21:02:12 +0000 (22:02 +0100)]
fixed level editor copy/paste using Ctrl-c/v for custom/group/DF elements
Before, all custom/group elements were mapped to first custom/group
element when copying them to the clipboard (as this was fine for level
sketches, which do not use any custom artwork anyway), but of course
this breaks copying level playfields in the level editor.
This bug was fixed (which will require updating/extending the level
sketch images for the R'n'D web forum).
Besides this, level sketches from level playfields that contain game
elements with a higher element number than 999 are changed to use a
format of always four digits for all game elements (which will also
require updating/extending the level sketch images for the forum).
Last but not least, while level sketches with four-digit element
number were already created, they were not parsed correctly when
reading them back from the clipboard, which was fixed, too.
Holger Schemel [Mon, 25 Feb 2019 20:46:54 +0000 (21:46 +0100)]
version number set to 4.1.2.1
Holger Schemel [Mon, 25 Feb 2019 20:40:52 +0000 (21:40 +0100)]
fixed level sketch copy/paste via clipboard on Windows (using CR+LF)
Before, level sketch copy/paste using Ctrl-c/v in level editor did not
work on Windows, where lines of text in the clipboard are terminated
with CR+LF (carriage return and line feed) instead of simple newlines.
This fixes this bug, and makes parsing level sketches from clipboard
a little bit more robust regarding empty lines and garbage text.
Holger Schemel [Thu, 21 Feb 2019 07:24:04 +0000 (08:24 +0100)]
fixed using (manually changed) invalid values for editor zoom tile size
Holger Schemel [Thu, 21 Feb 2019 00:48:54 +0000 (01:48 +0100)]
added more detailed messages for drag-and-drop actions
Holger Schemel [Wed, 20 Feb 2019 23:59:11 +0000 (00:59 +0100)]
fixed drag-and-drop support for SDL older than version 2.0.5
Holger Schemel [Mon, 18 Feb 2019 19:47:41 +0000 (20:47 +0100)]
fixed creating graphics without video device
Holger Schemel [Mon, 18 Feb 2019 08:09:42 +0000 (09:09 +0100)]
fixed compiler warning (introduced with GCC 7.1)
Holger Schemel [Sun, 17 Feb 2019 23:12:14 +0000 (00:12 +0100)]
fixed bug causing access to negative array index
Holger Schemel [Sun, 17 Feb 2019 21:11:12 +0000 (22:11 +0100)]
fixed compiler warning
Holger Schemel [Sun, 17 Feb 2019 21:02:36 +0000 (22:02 +0100)]
minor code cleanup
Holger Schemel [Sun, 17 Feb 2019 21:01:13 +0000 (22:01 +0100)]
fixed compiler warning
Holger Schemel [Sun, 17 Feb 2019 20:38:44 +0000 (21:38 +0100)]
fixed compilation problems of minizip code on Linux
Holger Schemel [Sun, 17 Feb 2019 18:58:28 +0000 (19:58 +0100)]
version number set to 4.1.2.0
Holger Schemel [Sun, 17 Feb 2019 18:57:03 +0000 (19:57 +0100)]
updated title text and border graphic to show current year
Holger Schemel [Sun, 17 Feb 2019 18:35:56 +0000 (19:35 +0100)]
fixed removing same player in level editor when drawing new player
Before this fix, this feature did not work with player 2, 3 and 4,
and it also did not work with "sokoban field with player" element.
Holger Schemel [Sat, 16 Feb 2019 11:48:07 +0000 (12:48 +0100)]
fixed bug with using too large scroll delay value on smaller playfields
Holger Schemel [Sat, 16 Feb 2019 09:52:55 +0000 (10:52 +0100)]
fixed bug with envelopes only displayed for the first player
Holger Schemel [Thu, 14 Feb 2019 21:28:28 +0000 (22:28 +0100)]
fixed bug with ignoring defined size for some main menu buttons
This is a regression bug caused by commit
e17dc52b, which changed the
handling of main menu buttons for first level, last level and level
number from "simple screen buttons" to "real gadgets". Unfortunately,
it also caused ignoring their width and height, instead using the
"default button size" of 32x32 pixels for them, regardless of their
width and height defined to other values in file "graphicsinfo.conf".
Holger Schemel [Wed, 13 Feb 2019 00:24:38 +0000 (01:24 +0100)]
fixed bug with summarized input actions in network games
Holger Schemel [Wed, 13 Feb 2019 00:02:09 +0000 (01:02 +0100)]
fixed bug with not mapping input actions to focussed player in team mode
Holger Schemel [Tue, 12 Feb 2019 23:44:29 +0000 (00:44 +0100)]
fixed bug with screen relocation on even sized playfield screen
Holger Schemel [Tue, 12 Feb 2019 23:36:20 +0000 (00:36 +0100)]
prepared some tool functions for the following commit
Holger Schemel [Tue, 12 Feb 2019 08:42:23 +0000 (09:42 +0100)]
small code cleanup
Holger Schemel [Mon, 11 Feb 2019 19:46:41 +0000 (20:46 +0100)]
minor whitespace change
Holger Schemel [Mon, 11 Feb 2019 19:17:28 +0000 (20:17 +0100)]
minor whitespace change
Holger Schemel [Mon, 11 Feb 2019 19:16:12 +0000 (20:16 +0100)]
fixed bug with even sized playfield screen and levels without border element
Holger Schemel [Sun, 10 Feb 2019 20:01:01 +0000 (21:01 +0100)]
fixed bug with not undrawing virtual buttons when moving finger away
Holger Schemel [Sat, 9 Feb 2019 00:47:41 +0000 (01:47 +0100)]
small code cleanup (using same order of variables and references to them)
Holger Schemel [Sat, 9 Feb 2019 00:45:47 +0000 (01:45 +0100)]
added hiding complete setup sub-menus marked with '.hide'
Holger Schemel [Sat, 9 Feb 2019 00:23:59 +0000 (01:23 +0100)]
cleanup of handling setup options
Holger Schemel [Thu, 7 Feb 2019 22:40:30 +0000 (23:40 +0100)]
fixed bug when snapping envelope (introduced by commit
931d95b5)
Holger Schemel [Thu, 7 Feb 2019 18:34:46 +0000 (19:34 +0100)]
changed drawing preview/network players if only level preview redefined
Problem: Drawing preview players (for team mode levels) and network
players (when connected to network server) in the main menu was added
at a time where already quite some custom artwork was created, which
did not know of these artwork definitions, so redefining the level
preview area might conflict with those player graphics added later
(and therefore maybe not redefined by these custom artwork sets).
Solution: If the position of the level preview is redefined, but the
positions of the preview or network player graphics are not redefined,
just skip drawing these player graphics.
Holger Schemel [Tue, 5 Feb 2019 20:57:02 +0000 (21:57 +0100)]
minor comments and whitespace changes
Holger Schemel [Tue, 5 Feb 2019 20:54:29 +0000 (21:54 +0100)]
removed unneeded screen redraw
Holger Schemel [Tue, 5 Feb 2019 20:49:11 +0000 (21:49 +0100)]
fixed bug with not redrawing level number in main menu changed by cursor
Holger Schemel [Tue, 5 Feb 2019 07:19:53 +0000 (08:19 +0100)]
removed code and image for using virtual buttons from image file
Holger Schemel [Mon, 4 Feb 2019 21:44:54 +0000 (22:44 +0100)]
fixed potential crash bug for special versions without "classic" artwork
This bug can happen when using the program binary within a special,
customized version of R'n'D like "R'n'D jue" that does not contain
the usual "classic" artwork (like the graphics set "gfx_classic").
The problem is solved by doing a fallback to the default artwork set
(as it can be defined using "default_graphics_set") if the "classic"
artwork set cannot be found.
Holger Schemel [Mon, 4 Feb 2019 21:11:51 +0000 (22:11 +0100)]
improved some code with more compact variant of same functionality