[Scummvm-git-logs] scummvm master -> 7fdddc414fe7094a5793834c6d4a546c60cd79ef

[SupSuper]

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

Summary:
518d213fe8 ICB: Methods in typedef structs aren't allowed in latest C++
7fdddc414f ICB: Fix forbidden symbols


Commit: 518d213fe85c9efc2f09715c85d6788c75c2d4bf
    https://github.com/scummvm/scummvm/commit/518d213fe85c9efc2f09715c85d6788c75c2d4bf
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-09T21:57:27+01:00

Commit Message:
ICB: Methods in typedef structs aren't allowed in latest C++

Changed paths:
    engines/icb/player.h


diff --git a/engines/icb/player.h b/engines/icb/player.h
index a8a716f5be..aed9f1a59e 100644
--- a/engines/icb/player.h
+++ b/engines/icb/player.h
@@ -145,7 +145,7 @@ enum ButtonEnums {
 	__UNUSEDBUTTON = 256
 }; // Note, __EXAMINE was never used
 
-typedef struct {
+struct _input {
 	__player_momentum momentum;
 	__player_turn turn;
 
@@ -156,7 +156,7 @@ typedef struct {
 	uint IsButtonSet(const enum ButtonEnums b) const {
 		return (bitflag & b);
 	}
-} _input;
+};
 
 typedef struct {
 	PXreal x, z;


Commit: 7fdddc414fe7094a5793834c6d4a546c60cd79ef
    https://github.com/scummvm/scummvm/commit/7fdddc414fe7094a5793834c6d4a546c60cd79ef
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-09T21:57:28+01:00

Commit Message:
ICB: Fix forbidden symbols

Changed paths:
    engines/icb/configfile.cpp
    engines/icb/map_marker.cpp
    engines/icb/mission_functions.cpp


diff --git a/engines/icb/configfile.cpp b/engines/icb/configfile.cpp
index ce20acc508..01da6ee00e 100644
--- a/engines/icb/configfile.cpp
+++ b/engines/icb/configfile.cpp
@@ -27,6 +27,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <string>
 
 #include "engines/icb/configfile.h"
 
diff --git a/engines/icb/map_marker.cpp b/engines/icb/map_marker.cpp
index 03a1df4e13..fc2eaf3f2c 100644
--- a/engines/icb/map_marker.cpp
+++ b/engines/icb/map_marker.cpp
@@ -63,7 +63,7 @@ _map_marker *_marker::Fetch_marker_by_object_name(const char *name) {
 
 	if (num_markers) {
 		for (j = 0; j < num_markers; j++) {
-			if (!strncasecmp(marks[j].name, name, MARKER_NAME_LEN - 1))
+			if (!scumm_strnicmp(marks[j].name, name, MARKER_NAME_LEN - 1))
 				return (&marks[j]);
 		}
 	}
diff --git a/engines/icb/mission_functions.cpp b/engines/icb/mission_functions.cpp
index dafc06ffc8..ca89db9466 100644
--- a/engines/icb/mission_functions.cpp
+++ b/engines/icb/mission_functions.cpp
@@ -111,7 +111,7 @@ int FindMissionNumber(const char *mission) {
 
 	// Find which mission number this mission is
 	for (m = 0; m < NUMBER_OF_MISSIONS; m++) {
-		if (strcasecmp(g_mission_names[m], mission) == 0) {
+		if (scumm_stricmp(g_mission_names[m], mission) == 0) {
 			// Mission 8-9 special case check
 			if (m == 6) {
 				if (g_globalScriptVariables.GetVariable("mission9") == 1)