[Scummvm-git-logs] scummvm master -> 82f4ee86a9824a9cdfd5060d7bab23be381a46df

[dreammaster]

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:
82f4ee86a9 GLK: GLULXE: Stubs for float and operation files


Commit: 82f4ee86a9824a9cdfd5060d7bab23be381a46df
    https://github.com/scummvm/scummvm/commit/82f4ee86a9824a9cdfd5060d7bab23be381a46df
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-04-14T10:07:03-07:00

Commit Message:
GLK: GLULXE: Stubs for float and operation files

Changed paths:
  A engines/glk/glulxe/float.cpp
  A engines/glk/glulxe/float.h
  A engines/glk/glulxe/glkop.cpp
  A engines/glk/glulxe/glkop.h
    engines/glk/glk_dispa.cpp
    engines/glk/module.mk


diff --git a/engines/glk/glk_dispa.cpp b/engines/glk/glk_dispa.cpp
index 2dec9a1..38b03e5 100644
--- a/engines/glk/glk_dispa.cpp
+++ b/engines/glk/glk_dispa.cpp
@@ -730,7 +730,7 @@ void GlkAPI::gidispatch_call(uint32 funcnum, uint32 numargs, gluniversal_t *argl
         case 0x0025: /* window_get_size */
             {
                 int ix = 1;
-                uint32 *ptr1, *ptr2;
+                uint *ptr1, *ptr2;
                 if (!arglist[ix]._ptrflag) {
                     ptr1 = nullptr;
                 } else {
@@ -755,7 +755,7 @@ void GlkAPI::gidispatch_call(uint32 funcnum, uint32 numargs, gluniversal_t *argl
         case 0x0027: /* window_get_arrangement */
             {
                 int ix = 1;
-                uint32 *ptr1, *ptr2;
+                uint *ptr1, *ptr2;
                 winid_t *ptr3;
                 if (!arglist[ix]._ptrflag) {
                     ptr1 = nullptr;
@@ -1023,7 +1023,7 @@ void GlkAPI::gidispatch_call(uint32 funcnum, uint32 numargs, gluniversal_t *argl
         case 0x00E0: /* image_get_info */
             {
                 int ix = 1;
-                uint32 *ptr1, *ptr2;
+                uint *ptr1, *ptr2;
                 if (!arglist[ix]._ptrflag) {
                     ptr1 = nullptr;
                 } else {
diff --git a/engines/glk/glulxe/float.cpp b/engines/glk/glulxe/float.cpp
new file mode 100644
index 0000000..c1ffc77
--- /dev/null
+++ b/engines/glk/glulxe/float.cpp
@@ -0,0 +1,30 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "glk/glulxe/float.h"
+
+namespace Glk {
+namespace Glulxe {
+
+
+} // End of namespace Glulxe
+} // End of namespace Glk
diff --git a/engines/glk/glulxe/float.h b/engines/glk/glulxe/float.h
new file mode 100644
index 0000000..ed9d716
--- /dev/null
+++ b/engines/glk/glulxe/float.h
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GLK_GLULXE_FLOAT
+#define GLK_GLULXE_FLOAT
+
+#include "common/scummsys.h"
+#include "glk/glk_api.h"
+
+namespace Glk {
+namespace Glulxe {
+
+
+} // End of namespace Glulxe
+} // End of namespace Glk
+
+#endif
diff --git a/engines/glk/glulxe/glkop.cpp b/engines/glk/glulxe/glkop.cpp
new file mode 100644
index 0000000..af650a3
--- /dev/null
+++ b/engines/glk/glulxe/glkop.cpp
@@ -0,0 +1,30 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "glk/glulxe/glkop.h"
+
+namespace Glk {
+namespace Glulxe {
+
+
+} // End of namespace Glulxe
+} // End of namespace Glk
diff --git a/engines/glk/glulxe/glkop.h b/engines/glk/glulxe/glkop.h
new file mode 100644
index 0000000..ed9d716
--- /dev/null
+++ b/engines/glk/glulxe/glkop.h
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GLK_GLULXE_FLOAT
+#define GLK_GLULXE_FLOAT
+
+#include "common/scummsys.h"
+#include "glk/glk_api.h"
+
+namespace Glk {
+namespace Glulxe {
+
+
+} // End of namespace Glulxe
+} // End of namespace Glk
+
+#endif
diff --git a/engines/glk/module.mk b/engines/glk/module.mk
index 60c0ae8..2a41942 100644
--- a/engines/glk/module.mk
+++ b/engines/glk/module.mk
@@ -58,6 +58,8 @@ MODULE_OBJS := \
 	frotz/sound_folder.o \
 	frotz/windows.o \
 	glulxe/detection.o \
+	glulxe/float.o \
+	glulxe/glkop.o \
 	glulxe/glulxe.o \
 	magnetic/detection.o \
 	magnetic/magnetic.o \