aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/glulxe
diff options
context:
space:
mode:
authorPaul Gilbert2019-04-28 14:32:49 +1000
committerPaul Gilbert2019-04-28 14:32:49 +1000
commit401b010ef3f488601244129b93a6ea3bf5bc3fb1 (patch)
tree900462a107420f7d92bf4571086bce570f3d1a9c /engines/glk/glulxe
parentc72cde3149514dddb8f76f9e717a0fb03dcb8332 (diff)
downloadscummvm-rg350-401b010ef3f488601244129b93a6ea3bf5bc3fb1.tar.gz
scummvm-rg350-401b010ef3f488601244129b93a6ea3bf5bc3fb1.tar.bz2
scummvm-rg350-401b010ef3f488601244129b93a6ea3bf5bc3fb1.zip
GLK: Implementing more gli object registration
Diffstat (limited to 'engines/glk/glulxe')
-rw-r--r--engines/glk/glulxe/glkop.cpp8
-rw-r--r--engines/glk/glulxe/glulxe.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/glk/glulxe/glkop.cpp b/engines/glk/glulxe/glkop.cpp
index d19bbd2088..2595a870b1 100644
--- a/engines/glk/glulxe/glkop.cpp
+++ b/engines/glk/glulxe/glkop.cpp
@@ -73,11 +73,11 @@ static void classtable_unregister(void *obj, uint objclass, gidispatch_rock_t ob
g_vm->glulxe_classtable_unregister(obj, objclass, objrock);
}
-static gidispatch_rock_t retained_register(void *array, uint len, char *typecode) {
+static gidispatch_rock_t retained_register(void *array, uint len, const char *typecode) {
return g_vm->glulxe_retained_register(array, len, typecode);
}
-static void retained_unregister(void *array, uint len, char *typecode, gidispatch_rock_t objrock) {
+static void retained_unregister(void *array, uint len, const char *typecode, gidispatch_rock_t objrock) {
g_vm->glulxe_retained_unregister(array, len, typecode, objrock);
}
@@ -1132,7 +1132,7 @@ void Glulxe::release_temp_ptr_array(void **arr, uint addr, uint len, int objclas
}
}
-gidispatch_rock_t Glulxe::glulxe_retained_register(void *array, uint len, char *typecode) {
+gidispatch_rock_t Glulxe::glulxe_retained_register(void *array, uint len, const char *typecode) {
gidispatch_rock_t rock;
arrayref_t *arref = nullptr;
arrayref_t **aptr;
@@ -1164,7 +1164,7 @@ gidispatch_rock_t Glulxe::glulxe_retained_register(void *array, uint len, char *
return rock;
}
-void Glulxe::glulxe_retained_unregister(void *array, uint len, char *typecode, gidispatch_rock_t objrock) {
+void Glulxe::glulxe_retained_unregister(void *array, uint len, const char *typecode, gidispatch_rock_t objrock) {
arrayref_t *arref = nullptr;
arrayref_t **aptr;
uint ix, addr2, val;
diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index 99e8b1a643..cdb3735bb7 100644
--- a/engines/glk/glulxe/glulxe.h
+++ b/engines/glk/glulxe/glulxe.h
@@ -762,8 +762,8 @@ public:
void glulxe_classtable_unregister(void *obj, uint objclass, gidispatch_rock_t objrock);
- gidispatch_rock_t glulxe_retained_register(void *array, uint len, char *typecode);
- void glulxe_retained_unregister(void *array, uint len, char *typecode, gidispatch_rock_t objrock);
+ gidispatch_rock_t glulxe_retained_register(void *array, uint len, const char *typecode);
+ void glulxe_retained_unregister(void *array, uint len, const char *typecode, gidispatch_rock_t objrock);
/**
* Turn a list of Glulx arguments into a list of Glk arguments, dispatch the function call, and return the result.