aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMax Horn2009-10-09 21:47:33 +0000
committerMax Horn2009-10-09 21:47:33 +0000
commit2e964baeef9a74d45090583b52419afa3c9c47bf (patch)
tree66106bd63ae8f9d7a1120d57344987856c961b56 /engines/sci/engine
parent6f1c43a7311d5e942f055087e307d6a537e159c6 (diff)
downloadscummvm-rg350-2e964baeef9a74d45090583b52419afa3c9c47bf.tar.gz
scummvm-rg350-2e964baeef9a74d45090583b52419afa3c9c47bf.tar.bz2
scummvm-rg350-2e964baeef9a74d45090583b52419afa3c9c47bf.zip
Some const correctness changes; cleanup
svn-id: r44850
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kfile.cpp4
-rw-r--r--engines/sci/engine/klists.cpp4
-rw-r--r--engines/sci/engine/kpathing.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index a1b17d58a2..40d98a9ce6 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -440,8 +440,8 @@ struct SavegameDesc {
};
static int _savegame_index_struct_compare(const void *a, const void *b) {
- SavegameDesc *A = (SavegameDesc *)a;
- SavegameDesc *B = (SavegameDesc *)b;
+ const SavegameDesc *A = (const SavegameDesc *)a;
+ const SavegameDesc *B = (const SavegameDesc *)b;
if (B->date != A->date)
return B->date - A->date;
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 4a171eab65..17caae0e43 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -371,8 +371,8 @@ struct sort_temp_t {
};
int sort_temp_cmp(const void *p1, const void *p2) {
- sort_temp_t *st1 = (sort_temp_t *)p1;
- sort_temp_t *st2 = (sort_temp_t *)p2;
+ const sort_temp_t *st1 = (const sort_temp_t *)p1;
+ const sort_temp_t *st2 = (const sort_temp_t *)p2;
if (st1->order.segment < st1->order.segment || (st1->order.segment == st1->order.segment && st1->order.offset < st2->order.offset))
return -1;
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 2671aad6b6..1df6b086ff 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -611,8 +611,8 @@ static int vertex_compare(const void *a, const void *b) {
// Returns : (int) -1 if a is smaller than b, 1 if a is larger than b, and
// 0 if a and b are equal
const Common::Point &p0 = s_vertex_cur->v;
- const Common::Point &p1 = (*(Vertex **) a)->v;
- const Common::Point &p2 = (*(Vertex **) b)->v;
+ const Common::Point &p1 = (*(const Vertex **) a)->v;
+ const Common::Point &p2 = (*(const Vertex **) b)->v;
if (p1 == p2)
return 0;