Screenshot and Input update, requires C++17

* SystemEvents in KeyChecker
* ControlMenu now looks like ChasmPortable >=1.05 weapon_prev/next
* SavesComment now contains time instead of LevelHealth
* TGAWrite modification for screenshots

Author: Jon Daniel

.gitignore

@@ -1,7 +1,8 @@
 # Windows binaries
 *.exe
 *.dll
-
+*a.out
+*.so
 
 # QtCreator project user settings
 *.user
@@ -20,13 +21,32 @@ build-*
 *.cfg
 
 # Game data
-csm.bin
-CSM.BIN
-CSM.bin
-csm.BIN
+*.bin
+*.BIN
+CURSED/
+CURSED/*
+cursed/
+cursed/*
+MUSIC/
+MUSIC/*
+music/
+music/*
+ADDON1/
+ADDON1/*
+addon1/
+addon1/*
+borough/
+borough/*
+BOROUGH/
+BOROUGH/*
 
 # Game saves
 saves/*
+SAVES/*
+
+# Screen shots
+*.tga
+*.TGA
 
 # Build system
 CMakeFiles/*

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 
 project(Chasm-Reverse)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 if(MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS /MP")

LICENSE

@@ -52,15 +52,20 @@ the command option `--csm` strings, for example:
 
 `./PanzerChasm --csm CSM_RUS.BIN`
 
-To run the add-on, you must additionally specify the path to it through the 
-parameter command line `--addon`, for example:
-
-`./PanzerChasm --addon ADDON1`
-
 In order to execute some console command at start, use `--exec` option, for example:
 
  `./PanzerChasm --exec "load saves/save_00.pcs"` to start game and immediately load first saved game.
 
+#### Available add-ons:
+
+* Chasm - The Shadow Zone: ADDON1
+* Chasm - Cursed Land    : cursed
+* Chasm - Grim Borough   : borough
+
+To run the add-on, you must additionally specify the path to it through the 
+parameter command line `--addon` or `-addon`, for example:
+
+`./PanzerChasm --addon ADDON1`
 
 #### Control
 

README.md

@@ -1,3 +1,4 @@
+#include <chrono>
 #include "../assert.hpp"
 #include "../game_constants.hpp"
 #include "../i_drawers_factory.hpp"
@@ -16,7 +17,7 @@
 #include "i_hud_drawer.hpp"
 #include "i_map_drawer.hpp"
 #include "i_minimap_drawer.hpp"
-
+#include "../key_checker.hpp"
 #include "client.hpp"
 
 namespace PanzerChasm
@@ -138,8 +139,11 @@ void Client::Save( SaveLoadBuffer& buffer, SaveComment& out_save_comment )
 	for( const bool& wall_visibility : dynamic_walls_visibility )
 		save_stream.WriteBool( wall_visibility );
 
+
+	std::time_t timestamp = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+
 	// Write comment
-	std::snprintf( out_save_comment.data(), sizeof(SaveComment), "Level%2d  health %03d", current_map_data_->number, player_state_.health );
+	std::snprintf( out_save_comment.data(), sizeof(SaveComment), "%s", ctime( &timestamp ) + 4);
 }
 
 void Client::Load( const SaveLoadBuffer& buffer, unsigned int& buffer_pos )
@@ -222,43 +226,38 @@ void Client::ProcessEvents( const SystemEvents& events )
 				event.event.mouse_move.dx );
 		}
 
-		// Select weapon.
-		if( event.type == SystemEvent::Type::Wheel && event.event.wheel.delta != 0 )
-		{
-			if(event.event.wheel.delta > 0) TrySwitchWeaponNext();
-			if(event.event.wheel.delta < 0) TrySwitchWeaponPrevious();
-		}
-
-		if( event.type == SystemEvent::Type::MouseKey &&
-                    event.event.mouse_key.mouse_button == SystemEvent::MouseKeyEvent::Button::Middle )
+		if( event.type == SystemEvent::Type::Key || event.type == SystemEvent::Type::MouseKey || event.type == SystemEvent::Type::Wheel)
 		{
-		    TrySwitchWeaponNext();
-		}
-
-		if( event.type == SystemEvent::Type::Key && event.event.key.pressed )
-		{
-			if( event.event.key.key_code >= KeyCode::K1 &&
-				static_cast<unsigned int>(event.event.key.key_code) < static_cast<unsigned int>(KeyCode::K1) + GameConstants::weapon_count )
+			const KeyChecker key_pressed( settings_, event );
+
+			if( key_pressed( SettingsKeys::key_weapon_next, KeyCode::MouseWheelDown ) ) TrySwitchWeaponNext();
+			if( key_pressed( SettingsKeys::key_weapon_prev, KeyCode::MouseWheelUp ) ) TrySwitchWeaponPrevious();
+			if( key_pressed( SettingsKeys::key_weapon_change, KeyCode::Mouse3 ) ) TrySwitchWeaponNext();
+			if( key_pressed( SettingsKeys::key_weapon_1, KeyCode::K1 ) ||
+			    key_pressed( SettingsKeys::key_weapon_2, KeyCode::K2 ) ||
+			    key_pressed( SettingsKeys::key_weapon_3, KeyCode::K3 ) ||
+			    key_pressed( SettingsKeys::key_weapon_4, KeyCode::K4 ) ||
+			    key_pressed( SettingsKeys::key_weapon_5, KeyCode::K5 ) ||
+			    key_pressed( SettingsKeys::key_weapon_6, KeyCode::K6 ) ||
+			    key_pressed( SettingsKeys::key_weapon_7, KeyCode::K7 ) ||
+			    key_pressed( SettingsKeys::key_weapon_8, KeyCode::K8 ) ||
+			    key_pressed( SettingsKeys::key_weapon_9, KeyCode::K9 ) )
 			{
 				unsigned int weapon_index=static_cast<unsigned int>( event.event.key.key_code ) - static_cast<unsigned int>( KeyCode::K1 );
 				if( player_state_.ammo[ weapon_index ] > 0u && ( player_state_.weapons_mask & (1u << weapon_index) ) != 0u )
 					requested_weapon_index_= weapon_index;
 			}
-
-			if( event.event.key.key_code == KeyCode::Tab )
-				minimap_mode_= !minimap_mode_;
-
-			if( event.event.key.key_code == KeyCode::Minus )
-				settings_.SetSetting( g_small_hud_mode, false );
-			if( event.event.key.key_code == KeyCode::Equals )
-				settings_.SetSetting( g_small_hud_mode, true );
+			if( key_pressed( SettingsKeys::key_minimap, KeyCode::Tab ) ) minimap_mode_= !minimap_mode_;
+			if( key_pressed( SettingsKeys::key_small_hud_off, KeyCode::Minus ) ) settings_.SetSetting( g_small_hud_mode, false );
+			if( key_pressed( SettingsKeys::key_small_hud_on, KeyCode::Equals ) ) settings_.SetSetting( g_small_hud_mode, true );
 		}
 	} // for events
 }
 
 void Client::Loop( const InputState& input_state, const bool paused )
 {
 	const Time current_real_time= Time::CurrentTime();
+	const KeyChecker key_pressed( settings_, input_state );
 
 	// Calculate time, which we spend in pause.
 	// Subtract time, spended in pauses, from real time.
@@ -306,14 +305,16 @@ void Client::Loop( const InputState& input_state, const bool paused )
 
 	{ // Scale minimap.
 		const float log2_delta= 2.0f * tick_dt_s;
-		if( input_state.keyboard[ static_cast<unsigned int>( SystemEvent::KeyEvent::KeyCode::SquareBrackretLeft ) ] )
+		
+		if( key_pressed( SettingsKeys::key_minimap_scale_dec, KeyCode::SquareBracketLeft ) )
 			minimap_scale_log2_-= log2_delta;
-		if( input_state.keyboard[ static_cast<unsigned int>( SystemEvent::KeyEvent::KeyCode::SquareBrackretRight ) ] )
+		if( key_pressed( SettingsKeys::key_minimap_scale_inc, KeyCode::SquareBracketRight ) )
 			minimap_scale_log2_+= log2_delta;
+
 		minimap_scale_log2_= std::max( -2.0f, std::min( minimap_scale_log2_, 1.0f ) );
 	}
 
-	camera_controller_.Tick( input_state.keyboard );
+	camera_controller_.Tick( input_state );
 
 	if( sound_engine_ != nullptr )
 	{
@@ -355,17 +356,17 @@ void Client::Loop( const InputState& input_state, const bool paused )
 		}
 		{ // Send move message
 			float move_direction, move_acceleration;
-			camera_controller_.GetAcceleration( input_state.keyboard, move_direction, move_acceleration );
+			camera_controller_.GetAcceleration( input_state, move_direction, move_acceleration );
 
 			Messages::PlayerMove message;
 			message.view_direction   = AngleToMessageAngle( camera_controller_.GetViewAngleZ() + Constants::half_pi );
 			message.move_direction   = AngleToMessageAngle( move_direction );
 			message.acceleration     = static_cast<unsigned char>( move_acceleration * 254.5f );
-			message.jump_pressed     = input_state.mouse[ static_cast<unsigned int>( SystemEvent::MouseKeyEvent::Button::Right ) ] || camera_controller_.JumpPressed();
+			message.jump_pressed     = key_pressed( SettingsKeys::key_jump, KeyCode::Mouse2 ) || camera_controller_.JumpPressed();
 			message.weapon_index     = requested_weapon_index_;
 			message.view_dir_angle_x = AngleToMessageAngle( camera_controller_.GetViewAngleX() );
 			message.view_dir_angle_z = AngleToMessageAngle( camera_controller_.GetViewAngleZ() );
-			message.shoot_pressed    = input_state.mouse[ static_cast<unsigned int>( SystemEvent::MouseKeyEvent::Button::Left ) ];
+			message.shoot_pressed    = key_pressed( SettingsKeys::key_fire, KeyCode::Mouse1 );
 			message.color            = settings_.GetOrSetInt( SettingsKeys::player_color );
 			connection_info_->messages_sender.SendUnreliableMessage( message );
 		}

src/client/client.cpp

@@ -3,43 +3,23 @@
 #include "game_constants.hpp"
 #include "settings.hpp"
 #include "shared_settings_keys.hpp"
-
 #include "movement_controller.hpp"
+#include "../key_checker.hpp"
 
 namespace PanzerChasm
 {
 
 static const float g_z_near= 1.0f / 12.0f; // Must be greater, then z_near in software rasterizer.
 
-using KeyCode= SystemEvent::KeyEvent::KeyCode;
-
-class KeyChecker
-{
-public:
-	KeyChecker( Settings& settings, const KeyboardState& keyboard_state )
-		: settings_(settings), keyboard_state_(keyboard_state)
-	{}
-
-	bool operator()( const char* const key_setting_name, const KeyCode default_value ) const
-	{
-		const KeyCode key= static_cast<KeyCode>( settings_.GetOrSetInt( key_setting_name, static_cast<int>(default_value) ) );
-		if( key > KeyCode::Unknown && key < KeyCode::KeyCount )
-			return keyboard_state_[ static_cast<unsigned int>( key ) ];
-		return false;
-	}
-
-private:
-	Settings& settings_;
-	const KeyboardState& keyboard_state_;
-};
-
 MovementController::MovementController(
 	Settings& settings,
 	const m_Vec3& angle,
 	float aspect )
 	: settings_( settings )
 	, angle_(angle), aspect_(aspect)
 	, speed_(0.0f)
+	, mouse_look_( settings_.GetOrSetBool( SettingsKeys::perm_mlook, true ) )
+	, mouse_look_pressed_( false )
 	, start_tick_( Time::CurrentTime() )
 	, prev_calc_tick_( Time::CurrentTime() )
 {
@@ -65,28 +45,32 @@ void MovementController::UpdateParams()
 	ClipCameraAngles();
 }
 
-void MovementController::Tick( const KeyboardState& keyboard_state )
+void MovementController::Tick( const InputState& input_state )
 {
 	const Time new_tick= Time::CurrentTime();
 
 	const float dt_s= ( new_tick - prev_calc_tick_ ).ToSeconds();
 
 	prev_calc_tick_= new_tick;
 
-	const KeyChecker key_pressed( settings_,keyboard_state );
+	const KeyChecker key_pressed( settings_, input_state );
 
 	m_Vec3 rotate_vec( 0.0f ,0.0f, 0.0f );
-	if( key_pressed( SettingsKeys::key_turn_left , KeyCode::Left  ) ) rotate_vec.z+= +1.0f;
-	if( key_pressed( SettingsKeys::key_turn_right, KeyCode::Right ) ) rotate_vec.z+= -1.0f;
-	if( key_pressed( SettingsKeys::key_look_up   , KeyCode::Up    ) ) rotate_vec.x+= +1.0f;
-	if( key_pressed( SettingsKeys::key_look_down , KeyCode::Down  ) ) rotate_vec.x+= -1.0f;
+
+	if( key_pressed( SettingsKeys::key_perm_mlook, KeyCode::E ) ) mouse_look_ = !mouse_look_;
+	if( key_pressed( SettingsKeys::key_turn_left  , KeyCode::KP4 ) ) rotate_vec.z+= +1.0f;
+	if( key_pressed( SettingsKeys::key_turn_right , KeyCode::KP6 ) ) rotate_vec.z+= -1.0f;
+	if( key_pressed( SettingsKeys::key_look_up    , KeyCode::KP8 ) ) rotate_vec.x+= +1.0f;
+	if( key_pressed( SettingsKeys::key_look_down  , KeyCode::KP2 ) ) rotate_vec.x+= -1.0f;
+	if( key_pressed( SettingsKeys::key_center_view, KeyCode::KP5 ) ) angle_.x = 0.0f;
 
 	const float rot_speed= 1.75f;
 	angle_+= dt_s * rot_speed * rotate_vec;
-	
+
 	ClipCameraAngles();
 
-	jump_pressed_= key_pressed( SettingsKeys::key_jump, KeyCode::Space );
+	jump_pressed_= key_pressed( SettingsKeys::key_jump, KeyCode::Mouse2 );
+	mouse_look_pressed_ = key_pressed( SettingsKeys::key_temp_mlook, KeyCode::Q );
 }
 
 void MovementController::SetSpeed( const float speed )
@@ -101,12 +85,12 @@ void MovementController::SetAngles( float z_angle, float x_angle )
 }
 
 void MovementController::GetAcceleration(
-	const KeyboardState& keyboard_state,
+	const InputState& input_state,
 	float& out_dir, float& out_acceleration ) const
 {
 	m_Vec3 move_vector(0.0f,0.0f,0.0f);
 
-	const KeyChecker key_pressed( settings_,keyboard_state );
+	const KeyChecker key_pressed( settings_,input_state );
 
 	if( key_pressed( SettingsKeys::key_forward   , KeyCode::W ) ) move_vector.y+= +1.0f;
 	if( key_pressed( SettingsKeys::key_backward  , KeyCode::S ) ) move_vector.y+= -1.0f;
@@ -265,41 +249,44 @@ bool MovementController::JumpPressed() const
 
 void MovementController::ControllerRotate( const int delta_x, const int delta_z )
 {
-	float base_sensetivity= settings_.GetOrSetFloat( SettingsKeys::mouse_sensetivity, 0.5f );
-	base_sensetivity= std::max( 0.0f, std::min( base_sensetivity, 1.0f ) );
-	settings_.SetSetting( SettingsKeys::mouse_sensetivity, base_sensetivity );
-
-	float d_x_f, d_z_f;
-	if( settings_.GetOrSetBool( "cl_mouse_filter", true ) )
+	if( ( mouse_look_pressed_ && !mouse_look_ ) || ( !mouse_look_pressed_ && mouse_look_) )
 	{
-		d_x_f= float( delta_x + prev_controller_delta_x_ ) * 0.5f;
-		d_z_f= float( delta_z + prev_controller_delta_z_ ) * 0.5f;
+		float base_sensetivity= settings_.GetOrSetFloat( SettingsKeys::mouse_sensetivity, 0.5f );
+		base_sensetivity= std::max( 0.0f, std::min( base_sensetivity, 1.0f ) );
+		settings_.SetSetting( SettingsKeys::mouse_sensetivity, base_sensetivity );
+
+		float d_x_f, d_z_f;
+		if( settings_.GetOrSetBool( "cl_mouse_filter", true ) )
+		{
+			d_x_f= float( delta_x + prev_controller_delta_x_ ) * 0.5f;
+			d_z_f= float( delta_z + prev_controller_delta_z_ ) * 0.5f;
+		}
+		else
+		{
+			d_x_f= float(delta_x);
+			d_z_f= float(delta_z);
+		}
+
+		if( settings_.GetOrSetBool( "cl_mouse_acceleration", true ) )
+		{
+			const float c_acceleration= 0.25f;
+			const float c_max_acceleration_factor= 2.0f;
+			d_x_f= std::min( c_acceleration * std::sqrt(std::abs(d_x_f)), c_max_acceleration_factor ) * d_x_f;
+			d_z_f= std::min( c_acceleration * std::sqrt(std::abs(d_z_f)), c_max_acceleration_factor ) * d_z_f;
+		}
+
+		const float c_max_exp_sensetivity= 8.0f;
+		const float exp_sensetivity= std::exp( base_sensetivity * std::log(c_max_exp_sensetivity) ); // [ 1; c_max_exp_sensetivity ]
+
+		const float c_pix_scale= 1.0f / 1024.0f;
+		const float z_direction= settings_.GetOrSetBool( SettingsKeys::reverse_mouse ) ? -1.0f : +1.0f;
+
+		angle_.x-= exp_sensetivity * c_pix_scale * d_x_f * z_direction;
+		angle_.z-= exp_sensetivity * c_pix_scale * d_z_f * 0.5f;
+
+		prev_controller_delta_x_= delta_x;
+		prev_controller_delta_z_= delta_z;
 	}
-	else
-	{
-		d_x_f= float(delta_x);
-		d_z_f= float(delta_z);
-	}
-
-	if( settings_.GetOrSetBool( "cl_mouse_acceleration", true ) )
-	{
-		const float c_acceleration= 0.25f;
-		const float c_max_acceleration_factor= 2.0f;
-		d_x_f= std::min( c_acceleration * std::sqrt(std::abs(d_x_f)), c_max_acceleration_factor ) * d_x_f;
-		d_z_f= std::min( c_acceleration * std::sqrt(std::abs(d_z_f)), c_max_acceleration_factor ) * d_z_f;
-	}
-
-	const float c_max_exp_sensetivity= 8.0f;
-	const float exp_sensetivity= std::exp( base_sensetivity * std::log(c_max_exp_sensetivity) ); // [ 1; c_max_exp_sensetivity ]
-
-	const float c_pix_scale= 1.0f / 1024.0f;
-	const float z_direction= settings_.GetOrSetBool( SettingsKeys::reverse_mouse ) ? -1.0f : +1.0f;
-
-	angle_.x-= exp_sensetivity * c_pix_scale * d_x_f * z_direction;
-	angle_.z-= exp_sensetivity * c_pix_scale * d_z_f * 0.5f;
-
-	prev_controller_delta_x_= delta_x;
-	prev_controller_delta_z_= delta_z;
 }
 
 void MovementController::ClipCameraAngles()