Mouselook improvements

AgentSvc/AgentSvc.cpp

@@ -13,7 +13,8 @@
 #include <process.h>    /* _beginthread, _endthread */
 #include <stddef.h>
 
-#include "AgentSvc_i.c"
+//#include "AgentSvc_i.c"
+
 
 #include <stdio.h>
 

AgentSvc/AgentSvc.vcxproj

@@ -17,27 +17,27 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D6AF1D9D-D4B3-4FEC-8EC3-166406A83AE4}</ProjectGuid>
     <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

AgentSvr/AgentSvr.vcxproj

@@ -20,30 +20,30 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E1FF5388-2AF5-4789-B5C2-DB40C41916CA}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Live Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

MessageMaker/LmItemDefs.cpp

@@ -674,58 +674,61 @@ void convert_hton(T x, void* ptr) {
 
 void FASTCALL LyraItem::ConvertStateToNetwork(void* ssptr)
 {
+
+    //initializing before switch
+    lyra_item_ward_t ward{};
+    lyra_item_missile_t missile{};
+    lyra_item_amulet_t amulet{};
+    lyra_item_area_effect_t area_effect{};
+    lyra_item_support_t support{};
+    lyra_item_essence_t essence{};
+    lyra_item_meta_essence_t meta_essence{};
+    lyra_item_scroll_t scroll{};
+    lyra_item_teleporter_t teleporter{};
+    lyra_item_train_support_t train_support{};
+    lyra_item_gratitude_t gratitude{};
+    lyra_item_meta_essence_nexus_t nexus{};
+    lyra_item_portkey_t portkey{};
+
   // switch on function, convert if necessary
   switch (StateFunction(ssptr)) {
-  case WARD_FUNCTION:
-    lyra_item_ward_t ward;
-    convert_hton(ward, ssptr);
-    break;
-  case MISSILE_FUNCTION:
-    lyra_item_missile_t missile;
+  case WARD_FUNCTION:      
+      convert_hton(ward, ssptr);
+      break;
+  case MISSILE_FUNCTION:    
     convert_hton(missile, ssptr);
     break;
-  case AMULET_FUNCTION:
-    lyra_item_amulet_t amulet;
+  case AMULET_FUNCTION:    
     convert_hton(amulet, ssptr);
     break;
-  case AREA_EFFECT_FUNCTION:
-    lyra_item_area_effect_t area_effect;
+  case AREA_EFFECT_FUNCTION:    
     convert_hton(area_effect, ssptr);
     break;
   case ESSENCE_FUNCTION:
-    lyra_item_essence_t essence;
     convert_hton(essence, ssptr);
     break;
   case SUPPORT_FUNCTION:
-    lyra_item_support_t support;
     convert_hton(support, ssptr);
     break;
   case META_ESSENCE_FUNCTION:
-    lyra_item_meta_essence_t meta_essence;
     convert_hton(meta_essence, ssptr);
     break;
-  case SCROLL_FUNCTION:
-    lyra_item_scroll_t scroll;
+  case SCROLL_FUNCTION:    
     convert_hton(scroll, ssptr);
     break;
-  case TELEPORTER_FUNCTION:
-    lyra_item_teleporter_t teleporter;
+  case TELEPORTER_FUNCTION:    
     convert_hton(teleporter, ssptr);
     break;
-  case SUPPORT_TRAIN_FUNCTION:
-    lyra_item_train_support_t train_support;
+  case SUPPORT_TRAIN_FUNCTION:    
     convert_hton(train_support, ssptr);
     break;
   case GRATITUDE_FUNCTION:
-	lyra_item_gratitude_t gratitude;
 	convert_hton(gratitude, ssptr);
 	break;
   case META_ESSENCE_NEXUS_FUNCTION:
-	lyra_item_meta_essence_nexus_t nexus;
 	convert_hton(nexus, ssptr);
 	break;
   case PORTKEY_FUNCTION:
-	  lyra_item_portkey_t portkey;
 	  convert_hton(portkey, ssptr);
 	  break;
   case NO_FUNCTION: // should be an error

MessageMaker/MessageMaker.vcxproj

@@ -20,29 +20,31 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B67BDCBE-DDF6-4BD2-882D-7C0D4BAB1560}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Live Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140_xp</PlatformToolset>
+
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -159,6 +161,9 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <FloatingPointExceptions>false</FloatingPointExceptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>

MessageMaker/MessageMaker.vcxproj.filters

@@ -372,6 +372,7 @@
     <ClInclude Include="RMsg_RoomDescription.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+
     <ClInclude Include="json_maker.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Underlight/.json

@@ -0,0 +1,39 @@
+{
+	"welcome_ai":	0,
+	"sound":	1,
+	"extra_scroll":	1,
+	"resolution":	1024,
+	"sound_active":	1,
+	"music_active":	1,
+	"reverse":	0,
+	"autoreject":	0,
+	"autorejoin":	1,
+	"nametags":	1,
+	"multiline":	0,
+	"footsteps":	1,
+	"art_prompts":	1,
+	"mouselook":	0,
+	"invertmouse":	0,
+	"log_chat":	1,
+	"effects_volume":	10,
+	"turnrate":	13,
+	"music_volume":	10,
+	"speech_color":	3,
+	"whisper_color":	3,
+	"message_color":	2,
+	"bg_color":	0,
+	"fullscreen":	0,
+	"classic_chat":	0,
+	"autorun":	1,
+	"adult_filter":	1,
+	"name":	"",
+	"password":	"",
+	"avatar":	"AAAAAAAAAAA=",
+	"num_bungholes":	0,
+	"ignore_list":	[],
+	"number_keys_mapped":	57,
+	"key_mappings":	"MQAAAEMAAABgAAAAMgAAACkAAAD/////SQAAAAMAAAD/////RAAAABsAAAD/////RQAAAAUAAAD/////RwAAAAYAAAD/////TAAAAEMAAAAzAAAATQAAAAgAAAD/////TgAAACQAAAD/////LAAAACUAAAD/////LgAAACYAAAD/////UgAAAAkAAAD/////PQAAAAoAAAD/////VAAAAAsAAAD/////3gAAAAcAAAD/////JgAAAAwAAAD/////QwAAAA0AAAD/////WAAAAA4AAAD/////JAAAABAAAAD/////IwAAAA8AAAD/////VwAAABEAAAD/////UwAAABIAAAD/////JQAAABMAAAD/////JwAAABQAAAD/////EQAAABcAAAD/////IAAAABgAAAD/////EgAAABYAAAD/////EAAAABUAAAD/////AQAAABcAAAD/////BAAAABwAAAD/////AgAAABYAAAD/////3AAAABwAAAD/////QQAAABoAAAD/////SwAAACcAAAD/////IQAAAB0AAAD/////IgAAAB4AAAD/////bwAAAB8AAAD/////agAAACAAAAD/////bQAAACEAAAD/////awAAACIAAAD/////RgAAAAAAAAD/////TwAAACoAAAD/////UAAAAEMAAAAAAAAAUQAAAEMAAAAFAAAAWQAAAEMAAAAGAAAAVQAAAEMAAAAlAAAAVgAAAEMAAABAAAAAQgAAAAEAAAD/////vwAAAEMAAAAOAAAAWgAAACwAAAD/////wAAAAC0AAAD/////LQAAAC4AAAD/////WwAAAC8AAAD/////XQAAADIAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+	"num_buddies":	0,
+	"buddies":	[],
+	"macros":	[null, null, null, null, null, null, null, null, null, null]
+}

Underlight/Keyboard.cpp

@@ -5,6 +5,7 @@
 #define STRICT
 
 #include "Central.h"
+#include <string>
 #include <windows.h>
 #include <windowsx.h>
 #include "cDDraw.h"
@@ -1288,7 +1289,18 @@ void Realm_OnKey(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UINT flags)
 	case LyraKeyboard::STRAFE: keyboard[Keystates::STRAFE] = 1; break;
 	case LyraKeyboard::SIDESTEP_LEFT: keyboard[Keystates::SIDESTEP_LEFT] = 1; break;
 	case LyraKeyboard::SIDESTEP_RIGHT: keyboard[Keystates::SIDESTEP_RIGHT] = 1; break;
-	case LyraKeyboard::MOUSE_LOOK: mouselooking = !options.mouselook; break;
+
+	case LyraKeyboard::MOUSE_LOOK: 
+	{
+		//flip the mouse looking sign if false to true , if true to false.
+		mouse_look.looking = !mouse_look.looking;
+		//if mouselook is on, display msg
+		if (mouse_look.looking) { display->DisplayMessage("Mouse Look Enabled.", false); }
+		//if mouselooks is off tell user via dsp msg
+		else { display->DisplayMessage("Mouse look Disabled.", false); }
+		break; 
+	}
+
 	case LyraKeyboard::WAVE: player->SetWaving(true);	break;
 
 		}
@@ -1735,7 +1747,8 @@ void Realm_OnKey(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UINT flags)
 		cp->SetUsing(false);
 		break;
 	case LyraKeyboard::MOUSE_LOOK:
-		mouselooking = options.mouselook;
+
+		mouselooking = !mouselooking;
 		SaveInGameRegistryOptionValues();
 		break;
 	case LyraKeyboard::SHOW_RANKS:

Underlight/Keyboard.h

@@ -34,7 +34,6 @@ const int num_keystates = 15;
 void __cdecl InitKeyboard(void);
 void __cdecl DeInitKeyboard(void);
 
-
 //////////////////////////////////////////////////////////////////
 // Keyboard message handlers