diff --git a/My_settings.h b/My_settings.h
index cf7eba5..8823b93 100644
--- a/My_settings.h
+++ b/My_settings.h
@@ -1,6 +1,6 @@
// Pokitto config required by PokittoLib
-//#define PROJ_SHOW_FPS_COUNTER
+#define PROJ_SHOW_FPS_COUNTER
#define PROJ_SCREENMODE 13
#define PROJ_MODE13 1
#define PROJ_ENABLE_SOUND 1
diff --git a/game.h b/game.h
index 9210122..257470d 100755
--- a/game.h
+++ b/game.h
@@ -3926,7 +3926,7 @@ void SFG_gameStep()
SFG_player.ammo[1] = SFG_game.save[4];
SFG_player.ammo[2] = SFG_game.save[5];
- if (SFG_keyIsDown(SFG_KEY_RIGHT) && SFG_game.saved != SFG_CANT_SAVE)
+ if (SFG_keyIsDown(SFG_KEY_RIGHT))
{
// save the current position
SFG_game.save[0] =
diff --git a/game.html b/game.html
deleted file mode 100644
index 1c29504..0000000
--- a/game.html
+++ /dev/null
@@ -1 +0,0 @@
-
game
\ No newline at end of file
diff --git a/main_pokitto.cpp b/main_pokitto.cpp
index 7c5d6cb..caea5bd 100644
--- a/main_pokitto.cpp
+++ b/main_pokitto.cpp
@@ -20,7 +20,17 @@
#define SFG_CPU_LOAD(x) printf("CPU: %d\n",x);
#endif
-#define SFG_FPS 22
+#if _OSCT == 2
+ // overclock
+ #define SFG_FPS 35
+ #define SFG_DIMINISH_SPRITES 1
+ #define SFG_RAYCASTING_MAX_HITS 6
+#else
+ #define SFG_FPS 22
+ #define SFG_DIMINISH_SPRITES 0
+ #define SFG_RAYCASTING_MAX_HITS 5
+#endif
+
#define SFG_CAN_EXIT 0
#define SFG_PLAYER_TURN_SPEED 135
@@ -34,10 +44,8 @@
#define SFG_RESOLUTION_SCALEDOWN 1
#define SFG_DITHERED_SHADOW 0
-#define SFG_DIMINISH_SPRITES 0
#define SFG_FOG_DIMINISH_STEP 2048
#define SFG_RAYCASTING_MAX_STEPS 20
-#define SFG_RAYCASTING_MAX_HITS 5
#define SFG_RAYCASTING_SUBSAMPLE 2
#include "game.h"
@@ -73,7 +81,12 @@ void SFG_setPixel(uint16_t x, uint16_t y, uint8_t colorIndex)
uint32_t SFG_getTimeMs()
{
- return pokitto.getTime();
+ return
+#if _OSCT == 2
+ // overclock
+ (3 * pokitto.getTime()) / 2;
+#endif
+ pokitto.getTime();
}
void SFG_sleepMs(uint16_t timeMs)
@@ -221,9 +234,16 @@ int main()
SFG_init();
while (pokitto.isRunning())
+ {
if (pokitto.update())
SFG_mainLoopBody();
+#if 0
+ pokitto.display.setCursor(0,0);
+ pokitto.display.print(pokitto.fps_counter);
+#endif
+ }
+
return 0;
}
diff --git a/main_sdl.c b/main_sdl.c
index 8667272..3afeb4d 100644
--- a/main_sdl.c
+++ b/main_sdl.c
@@ -61,6 +61,7 @@
#define SFG_SCREEN_RESOLUTION_Y 320
#define SFG_CAN_EXIT 0
#define SFG_RESOLUTION_SCALEDOWN 2
+ #define SFG_DITHERED_SHADOW 1
#define SFG_BACKGROUND_BLUR 0
#include
diff --git a/mbed_config.h b/mbed_config.h
index 34e7f96..0bc1a0b 100644
--- a/mbed_config.h
+++ b/mbed_config.h
@@ -1,25 +1 @@
-/*
- * mbed SDK
- * Copyright (c) 2017 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Automatically generated configuration file.
-// DO NOT EDIT, content will be overwritten.
-
-#ifndef __MBED_CONFIG_DATA__
-#define __MBED_CONFIG_DATA__
-
-
-#endif
+// Pokitto just needs this file.