Merge branch 'main' of https://github.com/rbergen/R136

Author: rbergen

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15.0)
 
 project(
   R136 
-  VERSION 3.3.3)
+  VERSION 3.4.0)
 
 set(CURSES_NEED_NCURSES 1)
 set(CURSES_NEED_WIDE 1)

R136.vcxproj

@@ -155,6 +155,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include="cpp.hint" />
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
@@ -163,6 +164,10 @@
     <ClInclude Include="include\commands.h" />
     <ClInclude Include="include\console.h" />
     <ClInclude Include="include\constants.h" />
+    <ClInclude Include="include\data\animates.h" />
+    <ClInclude Include="include\data\connections.h" />
+    <ClInclude Include="include\data\items.h" />
+    <ClInclude Include="include\data\rooms.h" />
     <ClInclude Include="include\gamedata.h" />
     <ClInclude Include="include\general.h" />
     <ClInclude Include="include\inlines\console.h" />
@@ -212,7 +217,7 @@
     <ClCompile Include="src\commands\simple.cpp" />
     <ClCompile Include="src\console.cpp" />
     <ClCompile Include="src\general.cpp" />
-    <ClCompile Include="src\init.cpp" />
+    <ClCompile Include="src\startup.cpp" />
     <ClCompile Include="src\intro.cpp" />
     <ClCompile Include="src\items\bandage.cpp" />
     <ClCompile Include="src\items\flashlight.cpp" />

R136.vcxproj.filters

@@ -27,9 +27,13 @@
     <Filter Include="Source Files\commands">
       <UniqueIdentifier>{6ee72562-7192-43fe-9f16-9638044da1e8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\data">
+      <UniqueIdentifier>{cf38056a-d53a-437d-b222-9b266661aada}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
+    <None Include="cpp.hint" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\base.h">
@@ -111,14 +115,26 @@
       <Filter>Header Files\inlines</Filter>
     </ClInclude>
     <ClInclude Include="include\templates\items.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\templates</Filter>
+    </ClInclude>
+    <ClInclude Include="include\data\rooms.h">
+      <Filter>Header Files\data</Filter>
+    </ClInclude>
+    <ClInclude Include="include\data\connections.h">
+      <Filter>Header Files\data</Filter>
+    </ClInclude>
+    <ClInclude Include="include\data\animates.h">
+      <Filter>Header Files\data</Filter>
+    </ClInclude>
+    <ClInclude Include="include\data\items.h">
+      <Filter>Header Files\data</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\console.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\init.cpp">
+    <ClCompile Include="src\startup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\gamedata.cpp">

README.md

@@ -20,7 +20,7 @@ After that, for non-Windows platforms, I've added a CMake build configuration. W
 * WSL (Ubuntu) using GCC and ncurses
 * MacOS using (MacOS native) Clang and ncurses
 
-Oh, yeah, the game is in Dutch, although the source code itself is now fully in English. I guess international awareness & orientation is something that developed in me over the past couple of decades...
+The game was originally only available in the Dutch language, but has now been translated to English as a second language. The source code itself is now fully in English, also. I guess international awareness & orientation took a couple of decades to develop in me, but here we are. (Note: getting R136 to start in English requires the `-e` command line argument to be passed to it; Dutch is still the default.)
 
 ## Credits
 

cpp.hint

@@ -0,0 +1,10 @@
+// Hint files help the Visual Studio IDE interpret Visual C++ identifiers
+// such as names of functions and macros.
+// For more information see https://go.microsoft.com/fwlink/?linkid=865984
+#define in_the_forest
+#define in_the_swamp
+#define at_an_open_space
+#define smelly_surface
+#define in_an_empty_cave
+#define in_a_stairwell_cave
+#define other_levels

include/actions.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "types/base.h"
 

include/animates.h

@@ -1,3 +1,3 @@
-#pragma once
+#pragma once
 
 #include "types/animates.h"

include/base.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "types/base.h"
 
@@ -7,4 +7,7 @@ AnimateStatus operator++(AnimateStatus& status, int);
 AnimateStatus& operator++(AnimateStatus& status);
 
 #include "templates/base.h"
-#include "inlines/base.h"
+#include "inlines/base.h"
+
+#define select(...)	select_language_param(core.language, __VA_ARGS__)
+#define get_y_or_n() (tolower(console.main().get_char_input(select("jJnN", "yYnN"))) == select((int)'j', (int)'y'))

include/commands.h

@@ -1,16 +1,18 @@
-#pragma once
+#pragma once
 
 #include "base.h"
 
 namespace commands
 {
-	bool finish();
+	bool finish(CoreData& core);
 
-	void wait(void);
+	void wait(CoreData& core);
 
 	void show_status(CoreData& core);
 
-	void show_help(void);
+	void switch_language(CoreData& core);
+
+	void show_help(CoreData& core);
 
 	void use(CoreData& core, ItemID item_id);
 

include/console.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "types/console.h"