[Scummvm-git-logs] scummvm master -> cebf36f86401dd6f7c5bebe99d9a279b6da5dc19

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cebf36f864 ICB: Remove some SDL leftovers


Commit: cebf36f86401dd6f7c5bebe99d9a279b6da5dc19
    https://github.com/scummvm/scummvm/commit/cebf36f86401dd6f7c5bebe99d9a279b6da5dc19
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2021-02-14T10:35:07+01:00

Commit Message:
ICB: Remove some SDL leftovers

Changed paths:
    engines/icb/p4_pc.cpp
    engines/icb/surface_manager.cpp


diff --git a/engines/icb/p4_pc.cpp b/engines/icb/p4_pc.cpp
index 20e535db70..ffbec63d82 100644
--- a/engines/icb/p4_pc.cpp
+++ b/engines/icb/p4_pc.cpp
@@ -288,9 +288,6 @@ void InitEngine(const char *lpCmdLine) {
 	// Set the character root directory to be the same as the normal root directory
 	camera_hack = false; // defaults to off
 
-#ifdef USE_SDL_DIRECTLY
-	sdl_window = SDL_CreateWindow("In Cold Blood (C)2000 Revolution Software Ltd", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, sdl_flags);
-#endif
 	// create the surface manaager
 	surface_manager = new _surface_manager;
 
@@ -376,14 +373,6 @@ bool mainLoopIteration() {
 
 	while (g_system->getEventManager()->pollEvent(event)) {
 		switch (event.type) {
-		/*
-		case SDL_TEXTINPUT:
-			if (event.text.text[0] && event.text.text[1] == 0) {
-				uint8 key = event.text.text[0];
-					WriteKey(key);
-			}
-			break;
-		*/
 		case Common::EVENT_KEYDOWN: {
 			// Pass ENTER and BACKSPACE KEYDOWN events to WriteKey() so the save menu in options_manager_pc.cpp can see them.
 			if (event.kbd.keycode == Common::KEYCODE_RETURN) {
@@ -394,7 +383,8 @@ bool mainLoopIteration() {
 				WriteKey(event.kbd.keycode);
 			}
 			setKeyState(event.kbd.keycode, true);
-		} break;
+			break;
+		}
 		case Common::EVENT_KEYUP: {
 			setKeyState(event.kbd.keycode, false);
 			break;
@@ -423,25 +413,6 @@ bool mainLoopIteration() {
 			mousex = event.mouse.x;
 			mousey = event.mouse.y;
 			break;
-		/*case SDL_WINDOWEVENT:
-			switch (event.window.event) {
-			case SDL_WINDOWEVENT_FOCUS_GAINED:
-				SDL_ShowCursor(SDL_FALSE);
-				gRegainedFocus = TRUE8;
-				gotTheFocus = TRUE8;
-				break;
-			case SDL_WINDOWEVENT_FOCUS_LOST:
-				SDL_ShowCursor(SDL_TRUE);
-				gRegainedFocus = FALSE8;
-				gotTheFocus = FALSE8;
-				break;
-			case SDL_WINDOWEVENT_EXPOSED:
-				stub.Process_stub();
-				break;
-			case SDL_WINDOWEVENT_CLOSE:
-				break;
-			}
-			break;*/
 
 		// TODO: Fix sound
 		/*case SDL_USEREVENT:
diff --git a/engines/icb/surface_manager.cpp b/engines/icb/surface_manager.cpp
index 3d3713712a..b35347c9ba 100644
--- a/engines/icb/surface_manager.cpp
+++ b/engines/icb/surface_manager.cpp
@@ -425,7 +425,6 @@ void _surface_manager::Blit_surface_to_surface(uint32 from_id, uint32 to_id, LRE
 			                  m_Surfaces[from_id]->m_colorKeyEnable, m_Surfaces[from_id]->m_colorKey);
 		}
 	}
-	//SDL_BlitSurface(srcSurface, pSrcRect ? &srcRect : NULL, destSurface, pDestRect ? &dstRect : NULL);
 }
 
 void _surface_manager::Blit_fillfx(uint32 surface_id, LRECT *rect, uint32 col) {