You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
1.4 KiB
54 lines
1.4 KiB
13 years ago
|
diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp
|
||
|
--- magiccube4d-src-2_2.orig/EventHandler.cpp 2007-09-30 12:01:46.503967712 +0200
|
||
|
+++ magiccube4d-src-2_2/EventHandler.cpp 2007-09-30 12:03:23.489172011 +0200
|
||
|
@@ -20,6 +20,7 @@
|
||
|
#include <iostream>
|
||
|
#include <unistd.h>
|
||
|
#include <stdio.h>
|
||
|
+#include <stdint.h>
|
||
|
|
||
|
#include "MagicCube.h"
|
||
|
#include "Puzzlest.h"
|
||
|
@@ -415,7 +416,7 @@
|
||
|
void
|
||
|
EventHandler::undo_cb(void* argp)
|
||
|
{
|
||
|
- int arg = (int) argp;
|
||
|
+ int arg = (intptr_t) argp;
|
||
|
struct stickerspec grip;
|
||
|
int dir;
|
||
|
int slicesmask;
|
||
|
@@ -461,7 +462,7 @@
|
||
|
void
|
||
|
EventHandler::redo_cb(void* argp)
|
||
|
{
|
||
|
- int arg = (int) argp;
|
||
|
+ int arg = (intptr_t) argp;
|
||
|
struct stickerspec grip;
|
||
|
int dir;
|
||
|
int slicesmask;
|
||
|
@@ -507,7 +508,7 @@
|
||
|
void
|
||
|
EventHandler::scramble_cb(void *arg = NULL)
|
||
|
{
|
||
|
- int n = (int)arg;
|
||
|
+ int n = (intptr_t)arg;
|
||
|
struct stickerspec grip;
|
||
|
int i, previous_face = -1;
|
||
|
int ngrips = NFACES * 3 * 3 * 3;
|
||
|
@@ -855,12 +856,12 @@
|
||
|
void
|
||
|
EventHandler::newPuzzle_cb(void* arg)
|
||
|
{
|
||
|
- if ((int)arg == preferences.getLength())
|
||
|
+ if ((intptr_t)arg == preferences.getLength())
|
||
|
{
|
||
|
reset_cb(0);
|
||
|
return;
|
||
|
}
|
||
|
- preferences.setLength((int)arg);
|
||
|
+ preferences.setLength((intptr_t)arg);
|
||
|
int length = preferences.getLength();
|
||
|
|
||
|
polymgr->reset(length);
|