Skip to content

Commit 1df725f

Browse files
efaefa
committed
Changed:
- show help with --help and -h too - Load/Save/Go input backspace without multiple ? - Go to room in capital HEX - added US:- or IT:' to input double quote " - better sanitize in Makefiles Bugfix: - with option -MAP missed NPC positions on map - portability ifdef for SDL_CreateRenderer(,,SDL_RendererFlags) on macOS and Raspberry - auto select rendering to work with Raspberry Pi via X protocol/SSH tunnels - reduced frequency of CYAN border drawn as BLACK, maybe related to 2 SDL_RenderPresent() call below SDL_Delay(20) ms - accept 'n' as first key to skip graphics with v1.2
1 parent 825384e commit 1df725f

22 files changed

+167
-150
lines changed

‎Changelog.txt

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
2.10 - 20241230
1+
2.10 - 20250106
22
---------------
33
Changed:
44
- show help with --help and -h too
55
- Load/Save/Go input backspace without multiple ?
66
- Go to room in capital HEX
7+
- added US:- or IT:' to input double quote "
78
- better sanitize in Makefiles
89
Bugfix:
910
- with option -MAP missed NPC positions on map
11+
- portability ifdef for SDL_CreateRenderer(,,SDL_RendererFlags) on macOS and Raspberry
1012
- auto select rendering to work with Raspberry Pi via X protocol/SSH tunnels
13+
- reduced frequency of CYAN border drawn as BLACK, maybe related to 2 SDL_RenderPresent() call below SDL_Delay(20) ms
14+
- accept 'n' as first key to skip graphics with v1.2
1115

1216
**Note:** .tgz packages require to install dependencies libs. On Debian12 the command is:
13-
'$ sudo apt install libsdl2-image-2.0-0 libcurl4 libzip4'
14-
**Note:** the package **WL2.10b_Lin32_armv7l.tgz** is for Raspberry Pi 3B+ @ 32bit, is built with -mfpu=neon optimization and so is not compatible with Raspberry Pi 1 and 2
15-
**Note:** the package **WL2.10b_Lin64_aarch64.tgz** is for Raspberry Pi 3B+ @ 64bit. Both packages for Raspberry Pi work locally and remotely via X protocol/SSH tunnels.
16-
**Note:** the package **WL2.10b_Linux_riscv64_64bit.tgz** for StarFive VisionFive2
17-
RISC-V @ 64bit work via x11 but is really slow as the GPU support for RISC-V is
18-
in development
19-
**Note:** the package **WL2.10b_Z80_WinMxe32.7z** is generated linked with **Z80** CPU emulator, this is for compatibility with old WL1.x snapshot files, but those snapshots won't work with 64 bit binaries, and are incompatible with current default binary and snapshots, generated with **z80emu** CPU emulator of all other packages
17+
'$ sudo apt install libsdl2-image-2.0-0 libcurl4 libzip4'
18+
**Note:** the package **WL2.10_Linux32_armv7l.tgz** is for Raspberry Pi 3B+ @ 32bit, is built with -mfpu=neon optimization and so is not compatible with Raspberry Pi 1 and 2
19+
**Note:** the package **WL2.10_Linux64_aarch64.tgz** is for Raspberry Pi 3B+ @ 64bit. Both packages for Raspberry Pi work locally and remotely via X protocol/SSH tunnels.
20+
**Note:** the package **WL2.10_Linux_riscv64_64bit.tgz** for StarFive VisionFive2 RISC-V @ 64bit work via x11 but is really slow as the GPU support for RISC-V is in development
21+
**Note:** the package **WL2.10_Z80_WinMxe32.7z** is generated linked with **Z80** CPU emulator, this is for compatibility with old WL1.x snapshot files, but those snapshots won't work with 64 bit binaries, and are incompatible with current default binary and snapshots, generated with **z80emu** CPU emulator of all other packages
2022

2123
2.10b - 20231203
2224
----------------

‎GlobalVars.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* *
55
* The global variables for the WL project *
66
* *
7-
* (c) 2012-2019 by CH, Copyright 2019-2024 Valerio Messina *
7+
* (c) 2012-2019 by CH, Copyright 2019-2025 Valerio Messina *
88
* *
9-
* V 2.10 - 20241230 *
9+
* V 2.10 - 20250106 *
1010
* *
1111
* GlobalVars.h is part of Wilderland - A Hobbit Environment *
1212
* Wilderland is free software: you can redistribute it and/or modify *

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile: Copyright 2019-2024 Valerio Messina [email protected]
1+
# Makefile: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# Makefile is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎Makefile32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile32: Copyright 2019-2024 Valerio Messina [email protected]
1+
# Makefile32: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# Makefile32 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MakefileG32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MakefileG32: Copyright 2019-2024 Valerio Messina [email protected]
1+
# MakefileG32: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# MakefileG32 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MakefileG64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MakefileG64: Copyright 2019-2024 Valerio Messina [email protected]
1+
# MakefileG64: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# MakefileG64 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MakefileM32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MakefileM32: Copyright 2019-2024 Valerio Messina [email protected]
1+
# MakefileM32: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# MakefileM32 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MakefileM64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MakefileM64: Copyright 2019-2024 Valerio Messina [email protected]
1+
# MakefileM64: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# MakefileM64 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MakefileO32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MakefileO32: Copyright 2019-2024 Valerio Messina [email protected]
1+
# MakefileO32: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# MakefileO32 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MakefileO64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MakefileO64: Copyright 2019-2024 Valerio Messina [email protected]
1+
# MakefileO64: Copyright 2019-2025 Valerio Messina [email protected]
22
#
33
# MakefileO64 is part of Wilderland - A Hobbit Environment
44
# Wilderland is free software: you can redistribute it and/or modify

‎MapCoordinates.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* *
55
* Map Coordinates for WL - Wilderland V 10 *
66
* *
7-
* (c) 2012-2019 by CH, Copyright 2019-2024 Valerio Messina *
7+
* (c) 2012-2019 by CH, Copyright 2019-2025 Valerio Messina *
88
* *
9-
* V 2.10 - 20241230 *
9+
* V 2.10 - 20250106 *
1010
* *
1111
* MapCoordinates.h is part of Wilderland - A Hobbit Environment *
1212
* Wilderland is free software: you can redistribute it and/or modify *

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
A Hobbit Environment
55

66
(c) 2012-2019 by CH
7-
(c) Copyright 2019-2024 Valerio Messina
7+
(c) Copyright 2019-2025 Valerio Messina
88

99
wilderland AT aonDOTat
1010
efa AT iol DOT it
@@ -356,4 +356,4 @@ Attributes, each object has 8 binary attributes associated with it:
356356
but you can G-o where the space misses
357357

358358

359-
README.txt Version 2.10 - 20241230
359+
README.txt Version 2.10 - 20250106

‎README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
A Hobbit Environment
55

66
(c) 2012-2019 by CH
7-
(c) Copyright 2019-2024 Valerio Messina
7+
(c) Copyright 2019-2025 Valerio Messina
88

99
wilderland AT aonDOTat
1010
efa AT iol DOT it
@@ -356,4 +356,4 @@ Attributes, each object has 8 binary attributes associated with it:
356356
but you can G-o where the space misses
357357

358358

359-
README.txt Version 2.10 - 20241230
359+
README.txt Version 2.10 - 20250106

‎SDLTWE.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* *
55
* SDL Text Windows Engine *
66
* *
7-
* (c) 2012-2019 by CH, Copyright 2019-2024 Valerio Messina *
7+
* (c) 2012-2019 by CH, Copyright 2019-2025 Valerio Messina *
88
* *
9-
* V 2.10 - 20241230 *
9+
* V 2.10 - 20250106 *
1010
* *
1111
* SDLTWE.c is part of Wilderland - A Hobbit Environment *
1212
* Wilderland is free software: you can redistribute it and/or modify *
@@ -33,7 +33,7 @@
3333
#include "GlobalVars.h"
3434

3535
/*** GLOBAL VARIABLES *******************************************************/
36-
int delay=20; // with SDL_RENDERER_ACCELERATED min 20 ms to avoid flickering
36+
int delay=22; // with SDL_RENDERER_ACCELERATED min 22 ms to avoid flickering
3737
byte firstEditable = 0; // column by SDLTWE_PrintCharTextWindow
3838

3939

‎SDLTWE.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* *
55
* SDL Text Windows Engine *
66
* *
7-
* (c) 2012-2019 by CH, Copyright 2019-2024 Valerio Messina *
7+
* (c) 2012-2019 by CH, Copyright 2019-2025 Valerio Messina *
88
* *
9-
* V 2.10 - 20241230 *
9+
* V 2.10 - 20250106 *
1010
* *
1111
* SDLTWE.h is part of Wilderland - A Hobbit Environment *
1212
* Wilderland is free software: you can redistribute it and/or modify *
@@ -32,10 +32,10 @@
3232

3333

3434
// input as ARGB8888, generate comma separated RGBA components for SetRenderDrawColor:
35-
#define compA(color) ((color>>24)&0xFF)
36-
#define compR(color) ((color>>16)&0xFF)
37-
#define compG(color) ((color>>8)&0xFF)
38-
#define compB(color) ((color>>0)&0xFF)
35+
#define compA(color) ((((uint32_t)color)>>24)&0xFF) // need cast or return 00
36+
#define compR(color) ((((uint32_t)color)>>16)&0xFF)
37+
#define compG(color) ((((uint32_t)color)>> 8)&0xFF)
38+
#define compB(color) ((((uint32_t)color)>> 0)&0xFF)
3939
#define components(color) compR(color),compG(color),compB(color),compA(color)
4040

4141

0 commit comments

Comments
 (0)