diff -Nru rocksndiamonds-4.3.8.1+dfsg/debian/changelog rocksndiamonds-4.3.8.2+dfsg/debian/changelog --- rocksndiamonds-4.3.8.1+dfsg/debian/changelog 2024-02-11 20:29:21.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/debian/changelog 2024-03-07 16:49:51.000000000 +0000 @@ -1,3 +1,9 @@ +rocksndiamonds (4.3.8.2+dfsg-1) unstable; urgency=medium + + * New upstream release. + + -- Stephen Kitt Thu, 07 Mar 2024 17:49:51 +0100 + rocksndiamonds (4.3.8.1+dfsg-1) unstable; urgency=medium * New upstream release. diff -Nru rocksndiamonds-4.3.8.1+dfsg/debian/copyright rocksndiamonds-4.3.8.2+dfsg/debian/copyright --- rocksndiamonds-4.3.8.1+dfsg/debian/copyright 2024-02-11 20:29:21.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/debian/copyright 2024-03-07 16:47:04.000000000 +0000 @@ -10,7 +10,7 @@ data from the upstream web site during installation. Files: * -Copyright: 1995-2023 Artsoft Entertainment, Holger Schemel +Copyright: 1995-2024 Artsoft Entertainment, Holger Schemel License: GPL-2+ Files: debian/* diff -Nru rocksndiamonds-4.3.8.1+dfsg/debian/postinst.in rocksndiamonds-4.3.8.2+dfsg/debian/postinst.in --- rocksndiamonds-4.3.8.1+dfsg/debian/postinst.in 2024-02-11 20:24:44.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/debian/postinst.in 2024-03-07 16:46:20.000000000 +0000 @@ -18,8 +18,8 @@ { url => 'http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-#VERSION#-linux.tar.gz', - # Valid for 4.3.8.1 - md5 => '9d25639d538680c38b81f6efd416c8c9', + # Valid for 4.3.8.2 + md5 => 'aaa530e6158597dfb3974b4db04bcded', topdir => 'rocksndiamonds-#VERSION#', }, diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/anim.c rocksndiamonds-4.3.8.2+dfsg/src/anim.c --- rocksndiamonds-4.3.8.1+dfsg/src/anim.c 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/anim.c 2024-02-18 14:18:07.000000000 +0000 @@ -598,10 +598,15 @@ anim->has_base = TRUE; } - // force pointer-style animations to pass-through clicks - if (part->control_info.class == get_hash_from_key("pointer") && - part->control_info.style == STYLE_DEFAULT) + // apply special settings to pointer-style animations + if (part->control_info.class == get_hash_from_key("pointer")) + { + // force pointer-style animations to be checked for clicks first + part->control_info.draw_order = 1000000; + + // force pointer-style animations to pass-through clicks part->control_info.style |= STYLE_PASSTHROUGH; + } } if (anim->num_parts > 0 || anim->has_base) diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/conf_gfx.c rocksndiamonds-4.3.8.2+dfsg/src/conf_gfx.c --- rocksndiamonds-4.3.8.1+dfsg/src/conf_gfx.c 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/conf_gfx.c 2024-02-18 14:18:07.000000000 +0000 @@ -6420,6 +6420,13 @@ { "gfx.game.button.load.height", "30" }, { "gfx.game.button.load.pressed_xoffset", "-100" }, + { "gfx.game.button.restart", "RocksDoor2.png" }, + { "gfx.game.button.restart.x", "200" }, + { "gfx.game.button.restart.y", "50" }, + { "gfx.game.button.restart.width", "30" }, + { "gfx.game.button.restart.height", "30" }, + { "gfx.game.button.restart.pressed_xoffset", "30" }, + { "gfx.game.button.sound_music", "RocksDoor.png" }, { "gfx.game.button.sound_music.x", "305" }, { "gfx.game.button.sound_music.y", "245" }, @@ -6445,6 +6452,7 @@ { "gfx.game.button.panel_stop", UNDEFINED_FILENAME }, { "gfx.game.button.panel_pause", UNDEFINED_FILENAME }, { "gfx.game.button.panel_play", UNDEFINED_FILENAME }, + { "gfx.game.button.panel_restart", UNDEFINED_FILENAME }, { "gfx.game.button.panel_sound_music", UNDEFINED_FILENAME }, { "gfx.game.button.panel_sound_loops", UNDEFINED_FILENAME }, @@ -6464,6 +6472,13 @@ { "gfx.game.button.touch_pause.pressed_xoffset", "-200" }, { "gfx.game.button.touch_pause.active_yoffset", "60" }, + { "gfx.game.button.touch_restart", "RocksTouch.png" }, + { "gfx.game.button.touch_restart.x", "210" }, + { "gfx.game.button.touch_restart.y", "240" }, + { "gfx.game.button.touch_restart.width", "60" }, + { "gfx.game.button.touch_restart.height", "60" }, + { "gfx.game.button.touch_restart.pressed_xoffset", "-200" }, + { "gfx.tape.button.eject", "RocksDoor.png" }, { "gfx.tape.button.eject.x", "305" }, { "gfx.tape.button.eject.y", "357" }, @@ -9733,6 +9748,8 @@ { "game.button.pause2.y", "-1" }, { "game.button.load.x", "-1" }, { "game.button.load.y", "-1" }, + { "game.button.restart.x", "-1" }, + { "game.button.restart.y", "-1" }, { "game.button.sound_music.x", "5" }, { "game.button.sound_music.y", "245" }, { "game.button.sound_loops.x", "35" }, @@ -9746,6 +9763,8 @@ { "game.button.panel_pause.y", "-1" }, { "game.button.panel_play.x", "-1" }, { "game.button.panel_play.y", "-1" }, + { "game.button.panel_restart.x", "-1" }, + { "game.button.panel_restart.y", "-1" }, { "game.button.panel_sound_music.x", "-1" }, { "game.button.panel_sound_music.y", "-1" }, { "game.button.panel_sound_loops.x", "-1" }, @@ -9757,6 +9776,8 @@ { "game.button.touch_stop.y", "0" }, { "game.button.touch_pause.x", "-60" }, { "game.button.touch_pause.y", "0" }, + { "game.button.touch_restart.x", "-1" }, + { "game.button.touch_restart.y", "-1" }, { "tape.button.eject.x", "5" }, { "tape.button.eject.y", "77" }, diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/conf_gfx.h rocksndiamonds-4.3.8.2+dfsg/src/conf_gfx.h --- rocksndiamonds-4.3.8.1+dfsg/src/conf_gfx.h 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/conf_gfx.h 2024-02-18 14:18:07.000000000 +0000 @@ -2185,289 +2185,292 @@ #define IMG_GFX_GAME_BUTTON_SAVE 2166 #define IMG_GFX_GAME_BUTTON_PAUSE2 2167 #define IMG_GFX_GAME_BUTTON_LOAD 2168 -#define IMG_GFX_GAME_BUTTON_SOUND_MUSIC 2169 -#define IMG_GFX_GAME_BUTTON_SOUND_LOOPS 2170 -#define IMG_GFX_GAME_BUTTON_SOUND_SIMPLE 2171 -#define IMG_GFX_GAME_BUTTON_PANEL_STOP 2172 -#define IMG_GFX_GAME_BUTTON_PANEL_PAUSE 2173 -#define IMG_GFX_GAME_BUTTON_PANEL_PLAY 2174 -#define IMG_GFX_GAME_BUTTON_PANEL_SOUND_MUSIC 2175 -#define IMG_GFX_GAME_BUTTON_PANEL_SOUND_LOOPS 2176 -#define IMG_GFX_GAME_BUTTON_PANEL_SOUND_SIMPLE 2177 -#define IMG_GFX_GAME_BUTTON_TOUCH_STOP 2178 -#define IMG_GFX_GAME_BUTTON_TOUCH_PAUSE 2179 -#define IMG_GFX_TAPE_BUTTON_EJECT 2180 -#define IMG_GFX_TAPE_BUTTON_EXTRA 2181 -#define IMG_GFX_TAPE_BUTTON_STOP 2182 -#define IMG_GFX_TAPE_BUTTON_PAUSE 2183 -#define IMG_GFX_TAPE_BUTTON_RECORD 2184 -#define IMG_GFX_TAPE_BUTTON_PLAY 2185 -#define IMG_GFX_TAPE_BUTTON_INSERT_SOLUTION 2186 -#define IMG_GFX_TAPE_BUTTON_PLAY_SOLUTION 2187 -#define IMG_GFX_TAPE_SYMBOL_EJECT 2188 -#define IMG_GFX_TAPE_SYMBOL_STOP 2189 -#define IMG_GFX_TAPE_SYMBOL_PAUSE 2190 -#define IMG_GFX_TAPE_SYMBOL_RECORD 2191 -#define IMG_GFX_TAPE_SYMBOL_PLAY 2192 -#define IMG_GFX_TAPE_SYMBOL_FAST_FORWARD 2193 -#define IMG_GFX_TAPE_SYMBOL_WARP_FORWARD 2194 -#define IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND 2195 -#define IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END 2196 -#define IMG_GFX_TAPE_SYMBOL_SINGLE_STEP 2197 -#define IMG_GFX_TAPE_LABEL_EJECT 2198 -#define IMG_GFX_TAPE_LABEL_STOP 2199 -#define IMG_GFX_TAPE_LABEL_PAUSE 2200 -#define IMG_GFX_TAPE_LABEL_RECORD 2201 -#define IMG_GFX_TAPE_LABEL_PLAY 2202 -#define IMG_GFX_TAPE_LABEL_FAST_FORWARD 2203 -#define IMG_GFX_TAPE_LABEL_WARP_FORWARD 2204 -#define IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND 2205 -#define IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END 2206 -#define IMG_GFX_TAPE_LABEL_SINGLE_STEP 2207 -#define IMG_GFX_TAPE_LABEL_DATE 2208 -#define IMG_GFX_TAPE_LABEL_TIME 2209 -#define IMG_GFX_REQUEST_BUTTON_YES 2210 -#define IMG_GFX_REQUEST_BUTTON_NO 2211 -#define IMG_GFX_REQUEST_BUTTON_CONFIRM 2212 -#define IMG_GFX_REQUEST_BUTTON_PLAYER_1 2213 -#define IMG_GFX_REQUEST_BUTTON_PLAYER_2 2214 -#define IMG_GFX_REQUEST_BUTTON_PLAYER_3 2215 -#define IMG_GFX_REQUEST_BUTTON_PLAYER_4 2216 -#define IMG_GFX_REQUEST_BUTTON_TOUCH_YES 2217 -#define IMG_GFX_REQUEST_BUTTON_TOUCH_NO 2218 -#define IMG_GFX_REQUEST_BUTTON_TOUCH_CONFIRM 2219 -#define IMG_FONT_INITIAL_1 2220 -#define IMG_FONT_INITIAL_2 2221 -#define IMG_FONT_INITIAL_3 2222 -#define IMG_FONT_INITIAL_4 2223 -#define IMG_FONT_TITLE_1 2224 -#define IMG_FONT_TITLE_2 2225 -#define IMG_FONT_TITLE_2_SETUP 2226 -#define IMG_FONT_MENU_1 2227 -#define IMG_FONT_MENU_1_ACTIVE 2228 -#define IMG_FONT_MENU_2 2229 -#define IMG_FONT_MENU_2_ACTIVE 2230 -#define IMG_FONT_TEXT_1 2231 -#define IMG_FONT_TEXT_1_MAIN 2232 -#define IMG_FONT_TEXT_1_LEVELS 2233 -#define IMG_FONT_TEXT_1_LEVELNR 2234 -#define IMG_FONT_TEXT_1_SETUP 2235 -#define IMG_FONT_TEXT_1_NAMES 2236 -#define IMG_FONT_TEXT_1_PREVIEW 2237 -#define IMG_FONT_TEXT_1_SCORES 2238 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 2239 -#define IMG_FONT_TEXT_1_PANEL 2240 -#define IMG_FONT_TEXT_1_DOOR 2241 -#define IMG_FONT_TEXT_2 2242 -#define IMG_FONT_TEXT_2_MAIN 2243 -#define IMG_FONT_TEXT_2_LEVELS 2244 -#define IMG_FONT_TEXT_2_LEVELNR 2245 -#define IMG_FONT_TEXT_2_SETUP 2246 -#define IMG_FONT_TEXT_2_NAMES 2247 -#define IMG_FONT_TEXT_2_PREVIEW 2248 -#define IMG_FONT_TEXT_2_SCORES 2249 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 2250 -#define IMG_FONT_TEXT_3 2251 -#define IMG_FONT_TEXT_3_LEVELS 2252 -#define IMG_FONT_TEXT_3_LEVELNR 2253 -#define IMG_FONT_TEXT_3_SETUP 2254 -#define IMG_FONT_TEXT_3_NAMES 2255 -#define IMG_FONT_TEXT_3_PREVIEW 2256 -#define IMG_FONT_TEXT_3_SCORES 2257 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 2258 -#define IMG_FONT_TEXT_4 2259 -#define IMG_FONT_TEXT_4_MAIN 2260 -#define IMG_FONT_TEXT_4_LEVELS 2261 -#define IMG_FONT_TEXT_4_LEVELNR 2262 -#define IMG_FONT_TEXT_4_SETUP 2263 -#define IMG_FONT_TEXT_4_NAMES 2264 -#define IMG_FONT_TEXT_4_SCORES 2265 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 2266 -#define IMG_FONT_ENVELOPE_1 2267 -#define IMG_FONT_ENVELOPE_2 2268 -#define IMG_FONT_ENVELOPE_3 2269 -#define IMG_FONT_ENVELOPE_4 2270 -#define IMG_FONT_REQUEST 2271 -#define IMG_FONT_REQUEST_NARROW 2272 -#define IMG_FONT_INPUT_1 2273 -#define IMG_FONT_INPUT_1_MAIN 2274 -#define IMG_FONT_INPUT_1_NAMES 2275 -#define IMG_FONT_INPUT_1_ACTIVE 2276 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 2277 -#define IMG_FONT_INPUT_1_ACTIVE_NAMES 2278 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 2279 -#define IMG_FONT_INPUT_2 2280 -#define IMG_FONT_INPUT_2_ACTIVE 2281 -#define IMG_FONT_OPTION_OFF 2282 -#define IMG_FONT_OPTION_OFF_NARROW 2283 -#define IMG_FONT_OPTION_ON 2284 -#define IMG_FONT_OPTION_ON_NARROW 2285 -#define IMG_FONT_VALUE_1 2286 -#define IMG_FONT_VALUE_2 2287 -#define IMG_FONT_VALUE_OLD 2288 -#define IMG_FONT_VALUE_OLD_NARROW 2289 -#define IMG_FONT_VALUE_NARROW 2290 -#define IMG_FONT_LEVEL_NUMBER 2291 -#define IMG_FONT_LEVEL_NUMBER_ACTIVE 2292 -#define IMG_FONT_TAPE_RECORDER 2293 -#define IMG_FONT_GAME_INFO 2294 -#define IMG_FONT_INFO_ELEMENTS 2295 -#define IMG_FONT_INFO_LEVELSET 2296 -#define IMG_FONT_MAIN_NETWORK_PLAYERS 2297 -#define IMG_EDITOR_ELEMENT_BORDER 2298 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 2299 -#define IMG_EDITOR_COUNTER_DOWN 2300 -#define IMG_EDITOR_COUNTER_UP 2301 -#define IMG_EDITOR_COUNTER_INPUT 2302 -#define IMG_EDITOR_SELECTBOX_INPUT 2303 -#define IMG_EDITOR_SELECTBOX_BUTTON 2304 -#define IMG_EDITOR_CHECKBOX 2305 -#define IMG_EDITOR_RADIOBUTTON 2306 -#define IMG_EDITOR_STICKYBUTTON 2307 -#define IMG_EDITOR_TABBUTTON 2308 -#define IMG_EDITOR_TEXTBUTTON 2309 -#define IMG_EDITOR_INPUT_TEXT 2310 -#define IMG_EDITOR_INPUT_TEXTAREA 2311 -#define IMG_EDITOR_CASCADE_LIST 2312 -#define IMG_EDITOR_CASCADE_LIST_ACTIVE 2313 -#define IMG_EDITOR_PALETTE_BUTTON 2314 -#define IMG_EDITOR_PALETTE_SCROLL_UP 2315 -#define IMG_EDITOR_PALETTE_SCROLL_DOWN 2316 -#define IMG_EDITOR_PALETTE_SCROLLBAR 2317 -#define IMG_EDITOR_PLAYFIELD_SCROLL_UP 2318 -#define IMG_EDITOR_PLAYFIELD_SCROLL_DOWN 2319 -#define IMG_EDITOR_PLAYFIELD_SCROLL_LEFT 2320 -#define IMG_EDITOR_PLAYFIELD_SCROLL_RIGHT 2321 -#define IMG_EDITOR_PLAYFIELD_SCROLLBAR 2322 -#define IMG_GFX_EDITOR_BUTTON_PREV_LEVEL 2323 -#define IMG_GFX_EDITOR_BUTTON_NEXT_LEVEL 2324 -#define IMG_GFX_EDITOR_BUTTON_PROPERTIES 2325 -#define IMG_GFX_EDITOR_BUTTON_ELEMENT_LEFT 2326 -#define IMG_GFX_EDITOR_BUTTON_ELEMENT_MIDDLE 2327 -#define IMG_GFX_EDITOR_BUTTON_ELEMENT_RIGHT 2328 -#define IMG_GFX_EDITOR_BUTTON_PALETTE 2329 -#define IMG_EDITOR_NO_TOOLBOX_BUTTON 2330 -#define IMG_GFX_EDITOR_BUTTON_DRAW_SINGLE 2331 -#define IMG_GFX_EDITOR_BUTTON_DRAW_CONNECTED 2332 -#define IMG_GFX_EDITOR_BUTTON_DRAW_LINE 2333 -#define IMG_GFX_EDITOR_BUTTON_DRAW_ARC 2334 -#define IMG_GFX_EDITOR_BUTTON_DRAW_RECTANGLE 2335 -#define IMG_GFX_EDITOR_BUTTON_DRAW_FILLED_BOX 2336 -#define IMG_GFX_EDITOR_BUTTON_ROTATE_UP 2337 -#define IMG_GFX_EDITOR_BUTTON_DRAW_TEXT 2338 -#define IMG_GFX_EDITOR_BUTTON_FLOOD_FILL 2339 -#define IMG_GFX_EDITOR_BUTTON_ROTATE_LEFT 2340 -#define IMG_GFX_EDITOR_BUTTON_ZOOM_LEVEL 2341 -#define IMG_GFX_EDITOR_BUTTON_ROTATE_RIGHT 2342 -#define IMG_GFX_EDITOR_BUTTON_DRAW_RANDOM 2343 -#define IMG_GFX_EDITOR_BUTTON_GRAB_BRUSH 2344 -#define IMG_GFX_EDITOR_BUTTON_ROTATE_DOWN 2345 -#define IMG_GFX_EDITOR_BUTTON_PICK_ELEMENT 2346 -#define IMG_GFX_EDITOR_BUTTON_CE_COPY_FROM 2347 -#define IMG_GFX_EDITOR_BUTTON_CE_COPY_TO 2348 -#define IMG_GFX_EDITOR_BUTTON_CE_SWAP 2349 -#define IMG_GFX_EDITOR_BUTTON_CE_COPY 2350 -#define IMG_GFX_EDITOR_BUTTON_CE_PASTE 2351 -#define IMG_GFX_EDITOR_BUTTON_CP_COPY 2352 -#define IMG_GFX_EDITOR_BUTTON_CP_PASTE 2353 -#define IMG_GFX_EDITOR_BUTTON_UNDO 2354 -#define IMG_GFX_EDITOR_BUTTON_CONF 2355 -#define IMG_GFX_EDITOR_BUTTON_SAVE 2356 -#define IMG_GFX_EDITOR_BUTTON_CLEAR 2357 -#define IMG_GFX_EDITOR_BUTTON_TEST 2358 -#define IMG_GFX_EDITOR_BUTTON_EXIT 2359 -#define IMG_GFX_EDITOR_INPUT_LEVEL_NUMBER 2360 -#define IMG_SETUP_INPUT_TEXT 2361 -#define IMG_GLOBAL_BORDER 2362 -#define IMG_GLOBAL_BORDER_MAIN 2363 -#define IMG_GLOBAL_BORDER_SCORES 2364 -#define IMG_GLOBAL_BORDER_EDITOR 2365 -#define IMG_GLOBAL_BORDER_PLAYING 2366 -#define IMG_GLOBAL_DOOR 2367 -#define IMG_GLOBAL_BUSY_INITIAL 2368 -#define IMG_GLOBAL_BUSY 2369 -#define IMG_GLOBAL_BUSY_PLAYFIELD 2370 -#define IMG_GLOBAL_TILE_CURSOR 2371 -#define IMG_BACKGROUND 2372 -#define IMG_BACKGROUND_LOADING_INITIAL 2373 -#define IMG_BACKGROUND_LOADING 2374 -#define IMG_BACKGROUND_TITLE_INITIAL 2375 -#define IMG_BACKGROUND_TITLE 2376 -#define IMG_BACKGROUND_MAIN 2377 -#define IMG_BACKGROUND_NAMES 2378 -#define IMG_BACKGROUND_LEVELS 2379 -#define IMG_BACKGROUND_LEVELNR 2380 -#define IMG_BACKGROUND_SCORES 2381 -#define IMG_BACKGROUND_SCOREINFO 2382 -#define IMG_BACKGROUND_EDITOR 2383 -#define IMG_BACKGROUND_INFO 2384 -#define IMG_BACKGROUND_INFO_ELEMENTS 2385 -#define IMG_BACKGROUND_INFO_MUSIC 2386 -#define IMG_BACKGROUND_INFO_CREDITS 2387 -#define IMG_BACKGROUND_INFO_PROGRAM 2388 -#define IMG_BACKGROUND_INFO_VERSION 2389 -#define IMG_BACKGROUND_INFO_LEVELSET 2390 -#define IMG_BACKGROUND_SETUP 2391 -#define IMG_BACKGROUND_PLAYING 2392 -#define IMG_BACKGROUND_DOOR 2393 -#define IMG_BACKGROUND_TAPE 2394 -#define IMG_BACKGROUND_PANEL 2395 -#define IMG_BACKGROUND_PALETTE 2396 -#define IMG_BACKGROUND_TOOLBOX 2397 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_1 2398 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_2 2399 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_3 2400 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_4 2401 -#define IMG_BACKGROUND_TITLESCREEN_INITIAL_5 2402 -#define IMG_BACKGROUND_TITLESCREEN_1 2403 -#define IMG_BACKGROUND_TITLESCREEN_2 2404 -#define IMG_BACKGROUND_TITLESCREEN_3 2405 -#define IMG_BACKGROUND_TITLESCREEN_4 2406 -#define IMG_BACKGROUND_TITLESCREEN_5 2407 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 2408 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2 2409 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3 2410 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4 2411 -#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5 2412 -#define IMG_BACKGROUND_TITLEMESSAGE_1 2413 -#define IMG_BACKGROUND_TITLEMESSAGE_2 2414 -#define IMG_BACKGROUND_TITLEMESSAGE_3 2415 -#define IMG_BACKGROUND_TITLEMESSAGE_4 2416 -#define IMG_BACKGROUND_TITLEMESSAGE_5 2417 -#define IMG_BACKGROUND_ENVELOPE_1 2418 -#define IMG_BACKGROUND_ENVELOPE_2 2419 -#define IMG_BACKGROUND_ENVELOPE_3 2420 -#define IMG_BACKGROUND_ENVELOPE_4 2421 -#define IMG_BACKGROUND_REQUEST 2422 -#define IMG_TITLESCREEN_INITIAL_1 2423 -#define IMG_TITLESCREEN_INITIAL_2 2424 -#define IMG_TITLESCREEN_INITIAL_3 2425 -#define IMG_TITLESCREEN_INITIAL_4 2426 -#define IMG_TITLESCREEN_INITIAL_5 2427 -#define IMG_TITLESCREEN_1 2428 -#define IMG_TITLESCREEN_2 2429 -#define IMG_TITLESCREEN_3 2430 -#define IMG_TITLESCREEN_4 2431 -#define IMG_TITLESCREEN_5 2432 -#define IMG_GFX_DOOR_1_PART_1 2433 -#define IMG_GFX_DOOR_1_PART_2 2434 -#define IMG_GFX_DOOR_1_PART_3 2435 -#define IMG_GFX_DOOR_1_PART_4 2436 -#define IMG_GFX_DOOR_1_PART_5 2437 -#define IMG_GFX_DOOR_1_PART_6 2438 -#define IMG_GFX_DOOR_1_PART_7 2439 -#define IMG_GFX_DOOR_1_PART_8 2440 -#define IMG_GFX_DOOR_2_PART_1 2441 -#define IMG_GFX_DOOR_2_PART_2 2442 -#define IMG_GFX_DOOR_2_PART_3 2443 -#define IMG_GFX_DOOR_2_PART_4 2444 -#define IMG_GFX_DOOR_2_PART_5 2445 -#define IMG_GFX_DOOR_2_PART_6 2446 -#define IMG_GFX_DOOR_2_PART_7 2447 -#define IMG_GFX_DOOR_2_PART_8 2448 -#define IMG_DOOR_2_TOP_BORDER_CORRECTION 2449 -#define IMG_LAST_IMAGE_ENTRY_BUG 2450 +#define IMG_GFX_GAME_BUTTON_RESTART 2169 +#define IMG_GFX_GAME_BUTTON_SOUND_MUSIC 2170 +#define IMG_GFX_GAME_BUTTON_SOUND_LOOPS 2171 +#define IMG_GFX_GAME_BUTTON_SOUND_SIMPLE 2172 +#define IMG_GFX_GAME_BUTTON_PANEL_STOP 2173 +#define IMG_GFX_GAME_BUTTON_PANEL_PAUSE 2174 +#define IMG_GFX_GAME_BUTTON_PANEL_PLAY 2175 +#define IMG_GFX_GAME_BUTTON_PANEL_RESTART 2176 +#define IMG_GFX_GAME_BUTTON_PANEL_SOUND_MUSIC 2177 +#define IMG_GFX_GAME_BUTTON_PANEL_SOUND_LOOPS 2178 +#define IMG_GFX_GAME_BUTTON_PANEL_SOUND_SIMPLE 2179 +#define IMG_GFX_GAME_BUTTON_TOUCH_STOP 2180 +#define IMG_GFX_GAME_BUTTON_TOUCH_PAUSE 2181 +#define IMG_GFX_GAME_BUTTON_TOUCH_RESTART 2182 +#define IMG_GFX_TAPE_BUTTON_EJECT 2183 +#define IMG_GFX_TAPE_BUTTON_EXTRA 2184 +#define IMG_GFX_TAPE_BUTTON_STOP 2185 +#define IMG_GFX_TAPE_BUTTON_PAUSE 2186 +#define IMG_GFX_TAPE_BUTTON_RECORD 2187 +#define IMG_GFX_TAPE_BUTTON_PLAY 2188 +#define IMG_GFX_TAPE_BUTTON_INSERT_SOLUTION 2189 +#define IMG_GFX_TAPE_BUTTON_PLAY_SOLUTION 2190 +#define IMG_GFX_TAPE_SYMBOL_EJECT 2191 +#define IMG_GFX_TAPE_SYMBOL_STOP 2192 +#define IMG_GFX_TAPE_SYMBOL_PAUSE 2193 +#define IMG_GFX_TAPE_SYMBOL_RECORD 2194 +#define IMG_GFX_TAPE_SYMBOL_PLAY 2195 +#define IMG_GFX_TAPE_SYMBOL_FAST_FORWARD 2196 +#define IMG_GFX_TAPE_SYMBOL_WARP_FORWARD 2197 +#define IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND 2198 +#define IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END 2199 +#define IMG_GFX_TAPE_SYMBOL_SINGLE_STEP 2200 +#define IMG_GFX_TAPE_LABEL_EJECT 2201 +#define IMG_GFX_TAPE_LABEL_STOP 2202 +#define IMG_GFX_TAPE_LABEL_PAUSE 2203 +#define IMG_GFX_TAPE_LABEL_RECORD 2204 +#define IMG_GFX_TAPE_LABEL_PLAY 2205 +#define IMG_GFX_TAPE_LABEL_FAST_FORWARD 2206 +#define IMG_GFX_TAPE_LABEL_WARP_FORWARD 2207 +#define IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND 2208 +#define IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END 2209 +#define IMG_GFX_TAPE_LABEL_SINGLE_STEP 2210 +#define IMG_GFX_TAPE_LABEL_DATE 2211 +#define IMG_GFX_TAPE_LABEL_TIME 2212 +#define IMG_GFX_REQUEST_BUTTON_YES 2213 +#define IMG_GFX_REQUEST_BUTTON_NO 2214 +#define IMG_GFX_REQUEST_BUTTON_CONFIRM 2215 +#define IMG_GFX_REQUEST_BUTTON_PLAYER_1 2216 +#define IMG_GFX_REQUEST_BUTTON_PLAYER_2 2217 +#define IMG_GFX_REQUEST_BUTTON_PLAYER_3 2218 +#define IMG_GFX_REQUEST_BUTTON_PLAYER_4 2219 +#define IMG_GFX_REQUEST_BUTTON_TOUCH_YES 2220 +#define IMG_GFX_REQUEST_BUTTON_TOUCH_NO 2221 +#define IMG_GFX_REQUEST_BUTTON_TOUCH_CONFIRM 2222 +#define IMG_FONT_INITIAL_1 2223 +#define IMG_FONT_INITIAL_2 2224 +#define IMG_FONT_INITIAL_3 2225 +#define IMG_FONT_INITIAL_4 2226 +#define IMG_FONT_TITLE_1 2227 +#define IMG_FONT_TITLE_2 2228 +#define IMG_FONT_TITLE_2_SETUP 2229 +#define IMG_FONT_MENU_1 2230 +#define IMG_FONT_MENU_1_ACTIVE 2231 +#define IMG_FONT_MENU_2 2232 +#define IMG_FONT_MENU_2_ACTIVE 2233 +#define IMG_FONT_TEXT_1 2234 +#define IMG_FONT_TEXT_1_MAIN 2235 +#define IMG_FONT_TEXT_1_LEVELS 2236 +#define IMG_FONT_TEXT_1_LEVELNR 2237 +#define IMG_FONT_TEXT_1_SETUP 2238 +#define IMG_FONT_TEXT_1_NAMES 2239 +#define IMG_FONT_TEXT_1_PREVIEW 2240 +#define IMG_FONT_TEXT_1_SCORES 2241 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 2242 +#define IMG_FONT_TEXT_1_PANEL 2243 +#define IMG_FONT_TEXT_1_DOOR 2244 +#define IMG_FONT_TEXT_2 2245 +#define IMG_FONT_TEXT_2_MAIN 2246 +#define IMG_FONT_TEXT_2_LEVELS 2247 +#define IMG_FONT_TEXT_2_LEVELNR 2248 +#define IMG_FONT_TEXT_2_SETUP 2249 +#define IMG_FONT_TEXT_2_NAMES 2250 +#define IMG_FONT_TEXT_2_PREVIEW 2251 +#define IMG_FONT_TEXT_2_SCORES 2252 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 2253 +#define IMG_FONT_TEXT_3 2254 +#define IMG_FONT_TEXT_3_LEVELS 2255 +#define IMG_FONT_TEXT_3_LEVELNR 2256 +#define IMG_FONT_TEXT_3_SETUP 2257 +#define IMG_FONT_TEXT_3_NAMES 2258 +#define IMG_FONT_TEXT_3_PREVIEW 2259 +#define IMG_FONT_TEXT_3_SCORES 2260 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 2261 +#define IMG_FONT_TEXT_4 2262 +#define IMG_FONT_TEXT_4_MAIN 2263 +#define IMG_FONT_TEXT_4_LEVELS 2264 +#define IMG_FONT_TEXT_4_LEVELNR 2265 +#define IMG_FONT_TEXT_4_SETUP 2266 +#define IMG_FONT_TEXT_4_NAMES 2267 +#define IMG_FONT_TEXT_4_SCORES 2268 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 2269 +#define IMG_FONT_ENVELOPE_1 2270 +#define IMG_FONT_ENVELOPE_2 2271 +#define IMG_FONT_ENVELOPE_3 2272 +#define IMG_FONT_ENVELOPE_4 2273 +#define IMG_FONT_REQUEST 2274 +#define IMG_FONT_REQUEST_NARROW 2275 +#define IMG_FONT_INPUT_1 2276 +#define IMG_FONT_INPUT_1_MAIN 2277 +#define IMG_FONT_INPUT_1_NAMES 2278 +#define IMG_FONT_INPUT_1_ACTIVE 2279 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 2280 +#define IMG_FONT_INPUT_1_ACTIVE_NAMES 2281 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 2282 +#define IMG_FONT_INPUT_2 2283 +#define IMG_FONT_INPUT_2_ACTIVE 2284 +#define IMG_FONT_OPTION_OFF 2285 +#define IMG_FONT_OPTION_OFF_NARROW 2286 +#define IMG_FONT_OPTION_ON 2287 +#define IMG_FONT_OPTION_ON_NARROW 2288 +#define IMG_FONT_VALUE_1 2289 +#define IMG_FONT_VALUE_2 2290 +#define IMG_FONT_VALUE_OLD 2291 +#define IMG_FONT_VALUE_OLD_NARROW 2292 +#define IMG_FONT_VALUE_NARROW 2293 +#define IMG_FONT_LEVEL_NUMBER 2294 +#define IMG_FONT_LEVEL_NUMBER_ACTIVE 2295 +#define IMG_FONT_TAPE_RECORDER 2296 +#define IMG_FONT_GAME_INFO 2297 +#define IMG_FONT_INFO_ELEMENTS 2298 +#define IMG_FONT_INFO_LEVELSET 2299 +#define IMG_FONT_MAIN_NETWORK_PLAYERS 2300 +#define IMG_EDITOR_ELEMENT_BORDER 2301 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 2302 +#define IMG_EDITOR_COUNTER_DOWN 2303 +#define IMG_EDITOR_COUNTER_UP 2304 +#define IMG_EDITOR_COUNTER_INPUT 2305 +#define IMG_EDITOR_SELECTBOX_INPUT 2306 +#define IMG_EDITOR_SELECTBOX_BUTTON 2307 +#define IMG_EDITOR_CHECKBOX 2308 +#define IMG_EDITOR_RADIOBUTTON 2309 +#define IMG_EDITOR_STICKYBUTTON 2310 +#define IMG_EDITOR_TABBUTTON 2311 +#define IMG_EDITOR_TEXTBUTTON 2312 +#define IMG_EDITOR_INPUT_TEXT 2313 +#define IMG_EDITOR_INPUT_TEXTAREA 2314 +#define IMG_EDITOR_CASCADE_LIST 2315 +#define IMG_EDITOR_CASCADE_LIST_ACTIVE 2316 +#define IMG_EDITOR_PALETTE_BUTTON 2317 +#define IMG_EDITOR_PALETTE_SCROLL_UP 2318 +#define IMG_EDITOR_PALETTE_SCROLL_DOWN 2319 +#define IMG_EDITOR_PALETTE_SCROLLBAR 2320 +#define IMG_EDITOR_PLAYFIELD_SCROLL_UP 2321 +#define IMG_EDITOR_PLAYFIELD_SCROLL_DOWN 2322 +#define IMG_EDITOR_PLAYFIELD_SCROLL_LEFT 2323 +#define IMG_EDITOR_PLAYFIELD_SCROLL_RIGHT 2324 +#define IMG_EDITOR_PLAYFIELD_SCROLLBAR 2325 +#define IMG_GFX_EDITOR_BUTTON_PREV_LEVEL 2326 +#define IMG_GFX_EDITOR_BUTTON_NEXT_LEVEL 2327 +#define IMG_GFX_EDITOR_BUTTON_PROPERTIES 2328 +#define IMG_GFX_EDITOR_BUTTON_ELEMENT_LEFT 2329 +#define IMG_GFX_EDITOR_BUTTON_ELEMENT_MIDDLE 2330 +#define IMG_GFX_EDITOR_BUTTON_ELEMENT_RIGHT 2331 +#define IMG_GFX_EDITOR_BUTTON_PALETTE 2332 +#define IMG_EDITOR_NO_TOOLBOX_BUTTON 2333 +#define IMG_GFX_EDITOR_BUTTON_DRAW_SINGLE 2334 +#define IMG_GFX_EDITOR_BUTTON_DRAW_CONNECTED 2335 +#define IMG_GFX_EDITOR_BUTTON_DRAW_LINE 2336 +#define IMG_GFX_EDITOR_BUTTON_DRAW_ARC 2337 +#define IMG_GFX_EDITOR_BUTTON_DRAW_RECTANGLE 2338 +#define IMG_GFX_EDITOR_BUTTON_DRAW_FILLED_BOX 2339 +#define IMG_GFX_EDITOR_BUTTON_ROTATE_UP 2340 +#define IMG_GFX_EDITOR_BUTTON_DRAW_TEXT 2341 +#define IMG_GFX_EDITOR_BUTTON_FLOOD_FILL 2342 +#define IMG_GFX_EDITOR_BUTTON_ROTATE_LEFT 2343 +#define IMG_GFX_EDITOR_BUTTON_ZOOM_LEVEL 2344 +#define IMG_GFX_EDITOR_BUTTON_ROTATE_RIGHT 2345 +#define IMG_GFX_EDITOR_BUTTON_DRAW_RANDOM 2346 +#define IMG_GFX_EDITOR_BUTTON_GRAB_BRUSH 2347 +#define IMG_GFX_EDITOR_BUTTON_ROTATE_DOWN 2348 +#define IMG_GFX_EDITOR_BUTTON_PICK_ELEMENT 2349 +#define IMG_GFX_EDITOR_BUTTON_CE_COPY_FROM 2350 +#define IMG_GFX_EDITOR_BUTTON_CE_COPY_TO 2351 +#define IMG_GFX_EDITOR_BUTTON_CE_SWAP 2352 +#define IMG_GFX_EDITOR_BUTTON_CE_COPY 2353 +#define IMG_GFX_EDITOR_BUTTON_CE_PASTE 2354 +#define IMG_GFX_EDITOR_BUTTON_CP_COPY 2355 +#define IMG_GFX_EDITOR_BUTTON_CP_PASTE 2356 +#define IMG_GFX_EDITOR_BUTTON_UNDO 2357 +#define IMG_GFX_EDITOR_BUTTON_CONF 2358 +#define IMG_GFX_EDITOR_BUTTON_SAVE 2359 +#define IMG_GFX_EDITOR_BUTTON_CLEAR 2360 +#define IMG_GFX_EDITOR_BUTTON_TEST 2361 +#define IMG_GFX_EDITOR_BUTTON_EXIT 2362 +#define IMG_GFX_EDITOR_INPUT_LEVEL_NUMBER 2363 +#define IMG_SETUP_INPUT_TEXT 2364 +#define IMG_GLOBAL_BORDER 2365 +#define IMG_GLOBAL_BORDER_MAIN 2366 +#define IMG_GLOBAL_BORDER_SCORES 2367 +#define IMG_GLOBAL_BORDER_EDITOR 2368 +#define IMG_GLOBAL_BORDER_PLAYING 2369 +#define IMG_GLOBAL_DOOR 2370 +#define IMG_GLOBAL_BUSY_INITIAL 2371 +#define IMG_GLOBAL_BUSY 2372 +#define IMG_GLOBAL_BUSY_PLAYFIELD 2373 +#define IMG_GLOBAL_TILE_CURSOR 2374 +#define IMG_BACKGROUND 2375 +#define IMG_BACKGROUND_LOADING_INITIAL 2376 +#define IMG_BACKGROUND_LOADING 2377 +#define IMG_BACKGROUND_TITLE_INITIAL 2378 +#define IMG_BACKGROUND_TITLE 2379 +#define IMG_BACKGROUND_MAIN 2380 +#define IMG_BACKGROUND_NAMES 2381 +#define IMG_BACKGROUND_LEVELS 2382 +#define IMG_BACKGROUND_LEVELNR 2383 +#define IMG_BACKGROUND_SCORES 2384 +#define IMG_BACKGROUND_SCOREINFO 2385 +#define IMG_BACKGROUND_EDITOR 2386 +#define IMG_BACKGROUND_INFO 2387 +#define IMG_BACKGROUND_INFO_ELEMENTS 2388 +#define IMG_BACKGROUND_INFO_MUSIC 2389 +#define IMG_BACKGROUND_INFO_CREDITS 2390 +#define IMG_BACKGROUND_INFO_PROGRAM 2391 +#define IMG_BACKGROUND_INFO_VERSION 2392 +#define IMG_BACKGROUND_INFO_LEVELSET 2393 +#define IMG_BACKGROUND_SETUP 2394 +#define IMG_BACKGROUND_PLAYING 2395 +#define IMG_BACKGROUND_DOOR 2396 +#define IMG_BACKGROUND_TAPE 2397 +#define IMG_BACKGROUND_PANEL 2398 +#define IMG_BACKGROUND_PALETTE 2399 +#define IMG_BACKGROUND_TOOLBOX 2400 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_1 2401 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_2 2402 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_3 2403 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_4 2404 +#define IMG_BACKGROUND_TITLESCREEN_INITIAL_5 2405 +#define IMG_BACKGROUND_TITLESCREEN_1 2406 +#define IMG_BACKGROUND_TITLESCREEN_2 2407 +#define IMG_BACKGROUND_TITLESCREEN_3 2408 +#define IMG_BACKGROUND_TITLESCREEN_4 2409 +#define IMG_BACKGROUND_TITLESCREEN_5 2410 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 2411 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2 2412 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3 2413 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4 2414 +#define IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5 2415 +#define IMG_BACKGROUND_TITLEMESSAGE_1 2416 +#define IMG_BACKGROUND_TITLEMESSAGE_2 2417 +#define IMG_BACKGROUND_TITLEMESSAGE_3 2418 +#define IMG_BACKGROUND_TITLEMESSAGE_4 2419 +#define IMG_BACKGROUND_TITLEMESSAGE_5 2420 +#define IMG_BACKGROUND_ENVELOPE_1 2421 +#define IMG_BACKGROUND_ENVELOPE_2 2422 +#define IMG_BACKGROUND_ENVELOPE_3 2423 +#define IMG_BACKGROUND_ENVELOPE_4 2424 +#define IMG_BACKGROUND_REQUEST 2425 +#define IMG_TITLESCREEN_INITIAL_1 2426 +#define IMG_TITLESCREEN_INITIAL_2 2427 +#define IMG_TITLESCREEN_INITIAL_3 2428 +#define IMG_TITLESCREEN_INITIAL_4 2429 +#define IMG_TITLESCREEN_INITIAL_5 2430 +#define IMG_TITLESCREEN_1 2431 +#define IMG_TITLESCREEN_2 2432 +#define IMG_TITLESCREEN_3 2433 +#define IMG_TITLESCREEN_4 2434 +#define IMG_TITLESCREEN_5 2435 +#define IMG_GFX_DOOR_1_PART_1 2436 +#define IMG_GFX_DOOR_1_PART_2 2437 +#define IMG_GFX_DOOR_1_PART_3 2438 +#define IMG_GFX_DOOR_1_PART_4 2439 +#define IMG_GFX_DOOR_1_PART_5 2440 +#define IMG_GFX_DOOR_1_PART_6 2441 +#define IMG_GFX_DOOR_1_PART_7 2442 +#define IMG_GFX_DOOR_1_PART_8 2443 +#define IMG_GFX_DOOR_2_PART_1 2444 +#define IMG_GFX_DOOR_2_PART_2 2445 +#define IMG_GFX_DOOR_2_PART_3 2446 +#define IMG_GFX_DOOR_2_PART_4 2447 +#define IMG_GFX_DOOR_2_PART_5 2448 +#define IMG_GFX_DOOR_2_PART_6 2449 +#define IMG_GFX_DOOR_2_PART_7 2450 +#define IMG_GFX_DOOR_2_PART_8 2451 +#define IMG_DOOR_2_TOP_BORDER_CORRECTION 2452 +#define IMG_LAST_IMAGE_ENTRY_BUG 2453 -#define NUM_IMAGE_FILES 2451 +#define NUM_IMAGE_FILES 2454 #endif // CONF_GFX_H diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/conf_var.c rocksndiamonds-4.3.8.2+dfsg/src/conf_var.c --- rocksndiamonds-4.3.8.1+dfsg/src/conf_var.c 2023-12-29 09:08:19.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/conf_var.c 2024-02-18 14:18:08.000000000 +0000 @@ -8911,6 +8911,14 @@ &game.button.load.y }, { + "game.button.restart.x", + &game.button.restart.x + }, + { + "game.button.restart.y", + &game.button.restart.y + }, + { "game.button.sound_music.x", &game.button.sound_music.x }, @@ -8959,6 +8967,14 @@ &game.button.panel_play.y }, { + "game.button.panel_restart.x", + &game.button.panel_restart.x + }, + { + "game.button.panel_restart.y", + &game.button.panel_restart.y + }, + { "game.button.panel_sound_music.x", &game.button.panel_sound_music.x }, @@ -8999,6 +9015,14 @@ &game.button.touch_pause.y }, { + "game.button.touch_restart.x", + &game.button.touch_restart.x + }, + { + "game.button.touch_restart.y", + &game.button.touch_restart.y + }, + { "tape.button.eject.x", &tape.button.eject.x }, diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/confhash.h rocksndiamonds-4.3.8.2+dfsg/src/confhash.h --- rocksndiamonds-4.3.8.1+dfsg/src/confhash.h 2023-12-29 09:08:32.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/confhash.h 2024-02-18 14:18:21.000000000 +0000 @@ -1 +1 @@ -#define SOURCE_HASH_STRING "e498c78" +#define SOURCE_HASH_STRING "de22300" diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/conftime.h rocksndiamonds-4.3.8.2+dfsg/src/conftime.h --- rocksndiamonds-4.3.8.1+dfsg/src/conftime.h 2023-12-29 09:08:32.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/conftime.h 2024-02-18 14:18:21.000000000 +0000 @@ -1 +1 @@ -#define SOURCE_DATE_STRING "2023-12-23 12:48" +#define SOURCE_DATE_STRING "2024-02-18 13:34" diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/files.c rocksndiamonds-4.3.8.2+dfsg/src/files.c --- rocksndiamonds-4.3.8.1+dfsg/src/files.c 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/files.c 2024-02-18 14:18:07.000000000 +0000 @@ -1903,8 +1903,7 @@ setElementChangeInfoToDefaults(ei->change); if (IS_CUSTOM_ELEMENT(element) || - IS_GROUP_ELEMENT(element) || - IS_INTERNAL_ELEMENT(element)) + IS_GROUP_ELEMENT(element)) { setElementDescriptionToDefault(ei); diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/game.c rocksndiamonds-4.3.8.2+dfsg/src/game.c --- rocksndiamonds-4.3.8.1+dfsg/src/game.c 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/game.c 2024-02-18 14:18:07.000000000 +0000 @@ -1017,19 +1017,22 @@ #define GAME_CTRL_ID_SAVE 5 #define GAME_CTRL_ID_PAUSE2 6 #define GAME_CTRL_ID_LOAD 7 -#define GAME_CTRL_ID_PANEL_STOP 8 -#define GAME_CTRL_ID_PANEL_PAUSE 9 -#define GAME_CTRL_ID_PANEL_PLAY 10 -#define GAME_CTRL_ID_TOUCH_STOP 11 -#define GAME_CTRL_ID_TOUCH_PAUSE 12 -#define SOUND_CTRL_ID_MUSIC 13 -#define SOUND_CTRL_ID_LOOPS 14 -#define SOUND_CTRL_ID_SIMPLE 15 -#define SOUND_CTRL_ID_PANEL_MUSIC 16 -#define SOUND_CTRL_ID_PANEL_LOOPS 17 -#define SOUND_CTRL_ID_PANEL_SIMPLE 18 +#define GAME_CTRL_ID_RESTART 8 +#define GAME_CTRL_ID_PANEL_STOP 9 +#define GAME_CTRL_ID_PANEL_PAUSE 10 +#define GAME_CTRL_ID_PANEL_PLAY 11 +#define GAME_CTRL_ID_PANEL_RESTART 12 +#define GAME_CTRL_ID_TOUCH_STOP 13 +#define GAME_CTRL_ID_TOUCH_PAUSE 14 +#define GAME_CTRL_ID_TOUCH_RESTART 15 +#define SOUND_CTRL_ID_MUSIC 16 +#define SOUND_CTRL_ID_LOOPS 17 +#define SOUND_CTRL_ID_SIMPLE 18 +#define SOUND_CTRL_ID_PANEL_MUSIC 19 +#define SOUND_CTRL_ID_PANEL_LOOPS 20 +#define SOUND_CTRL_ID_PANEL_SIMPLE 21 -#define NUM_GAME_BUTTONS 19 +#define NUM_GAME_BUTTONS 22 // forward declaration for internal use @@ -16247,6 +16250,11 @@ TRUE, FALSE, "load game" }, { + IMG_GFX_GAME_BUTTON_RESTART, &game.button.restart, + GAME_CTRL_ID_RESTART, NULL, + TRUE, FALSE, "restart game" + }, + { IMG_GFX_GAME_BUTTON_PANEL_STOP, &game.button.panel_stop, GAME_CTRL_ID_PANEL_STOP, NULL, FALSE, FALSE, "stop game" @@ -16262,6 +16270,11 @@ FALSE, FALSE, "play game" }, { + IMG_GFX_GAME_BUTTON_PANEL_RESTART, &game.button.panel_restart, + GAME_CTRL_ID_PANEL_RESTART, NULL, + FALSE, FALSE, "restart game" + }, + { IMG_GFX_GAME_BUTTON_TOUCH_STOP, &game.button.touch_stop, GAME_CTRL_ID_TOUCH_STOP, NULL, FALSE, TRUE, "stop game" @@ -16272,6 +16285,11 @@ FALSE, TRUE, "pause game" }, { + IMG_GFX_GAME_BUTTON_TOUCH_RESTART, &game.button.touch_restart, + GAME_CTRL_ID_TOUCH_RESTART, NULL, + FALSE, TRUE, "restart game" + }, + { IMG_GFX_GAME_BUTTON_SOUND_MUSIC, &game.button.sound_music, SOUND_CTRL_ID_MUSIC, &setup.sound_music, TRUE, FALSE, "background music on/off" @@ -16350,7 +16368,10 @@ id == GAME_CTRL_ID_PLAY || id == GAME_CTRL_ID_PANEL_PLAY || id == GAME_CTRL_ID_SAVE || - id == GAME_CTRL_ID_LOAD) + id == GAME_CTRL_ID_LOAD || + id == GAME_CTRL_ID_RESTART || + id == GAME_CTRL_ID_PANEL_RESTART || + id == GAME_CTRL_ID_TOUCH_RESTART) { button_type = GD_TYPE_NORMAL_BUTTON; checked = FALSE; @@ -16473,6 +16494,10 @@ }; int i; + // do not redraw pause button on closed door (may happen when restarting game) + if (!(GetDoorState() & DOOR_OPEN_1)) + return; + for (i = 0; ids[i] > -1; i++) ModifyGadget(game_gadget[ids[i]], GDI_CHECKED, tape.pausing, GDI_END); } @@ -16694,6 +16719,13 @@ TapeQuickLoad(); break; + case GAME_CTRL_ID_RESTART: + case GAME_CTRL_ID_PANEL_RESTART: + case GAME_CTRL_ID_TOUCH_RESTART: + TapeRestartGame(); + + break; + case SOUND_CTRL_ID_MUSIC: case SOUND_CTRL_ID_PANEL_MUSIC: if (setup.sound_music) diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/game.h rocksndiamonds-4.3.8.2+dfsg/src/game.h --- rocksndiamonds-4.3.8.1+dfsg/src/game.h 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/game.h 2024-02-18 14:18:07.000000000 +0000 @@ -123,6 +123,8 @@ struct XY pause2; struct XY load; + struct XY restart; + struct XY sound_music; struct XY sound_loops; struct XY sound_simple; @@ -131,12 +133,15 @@ struct XY panel_pause; struct XY panel_play; + struct XY panel_restart; + struct XY panel_sound_music; struct XY panel_sound_loops; struct XY panel_sound_simple; struct XY touch_stop; struct XY touch_pause; + struct XY touch_restart; }; struct GameSnapshotInfo diff -Nru rocksndiamonds-4.3.8.1+dfsg/src/main.h rocksndiamonds-4.3.8.2+dfsg/src/main.h --- rocksndiamonds-4.3.8.1+dfsg/src/main.h 2023-12-29 09:08:18.000000000 +0000 +++ rocksndiamonds-4.3.8.2+dfsg/src/main.h 2024-02-18 14:18:07.000000000 +0000 @@ -2664,14 +2664,14 @@ #define PROGRAM_VERSION_SUPER 4 #define PROGRAM_VERSION_MAJOR 3 #define PROGRAM_VERSION_MINOR 8 -#define PROGRAM_VERSION_PATCH 1 +#define PROGRAM_VERSION_PATCH 2 #define PROGRAM_VERSION_EXTRA "" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define PROGRAM_EMAIL_STRING "info@artsoft.org" #define PROGRAM_WEBSITE_STRING "https://www.artsoft.org/" -#define PROGRAM_COPYRIGHT_STRING "1995-2023 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "1995-2024 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_ICON_FILENAME "icons/icon.png"