diff options
| -rw-r--r-- | engines/glk/glk_dispa.cpp | 6 | ||||
| -rw-r--r-- | engines/glk/glulxe/float.cpp | 30 | ||||
| -rw-r--r-- | engines/glk/glulxe/float.h | 36 | ||||
| -rw-r--r-- | engines/glk/glulxe/glkop.cpp | 30 | ||||
| -rw-r--r-- | engines/glk/glulxe/glkop.h | 36 | ||||
| -rw-r--r-- | engines/glk/module.mk | 2 |
6 files changed, 137 insertions, 3 deletions
diff --git a/engines/glk/glk_dispa.cpp b/engines/glk/glk_dispa.cpp index 2dec9a19e4..38b03e5b42 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 0000000000..c1ffc77be9 --- /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 0000000000..ed9d716764 --- /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 0000000000..af650a3add --- /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 0000000000..ed9d716764 --- /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 60c0ae8843..2a419422f4 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 \ |