From 988228bb01f6d5415e94bc1175ce798135e01909 Mon Sep 17 00:00:00 2001 From: Joshua Date: Wed, 9 Oct 2013 19:02:45 -0400 Subject: [PATCH 1/2] Replace references to HypFacebook with HypRate --- HypRate.sublime-workspace | 32 ++++++++++---------- project/android/fr/hyperfiction/HypRate.java | 4 +-- project/common/ExternalInterface.cpp | 18 +++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/HypRate.sublime-workspace b/HypRate.sublime-workspace index ab96305..ca5f594 100644 --- a/HypRate.sublime-workspace +++ b/HypRate.sublime-workspace @@ -732,7 +732,7 @@ "/C/Developement/workspaceHaxe/HypRate/project/iPhone/include/Appirater.m", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_helloWorld/src/Photon_lib.cpp", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_helloWorld/inc/Photon_lib.h", - "/C/Developement/workspaceHaxe/HypFacebook/project/common/ExternalInterface.cpp", + "/C/Developement/workspaceHaxe/HypRate/project/common/ExternalInterface.cpp", "/C/Developement/workspaceHaxe/HypRate/project/common/ExternalInterface.cpp", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_realtime/src/CPhotonLib.cpp", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_realtime/inc/CPhotonLib.h", @@ -744,17 +744,17 @@ "/C/Developement/workspaceHaxe/HypRate/README.md", "/C/Developement/workspaceHaxe/HypRate/project/android/com/kopfgeldjaeger/ratememaybe/RateMeMaybe.java", "/C/Developement/workspaceHaxe/HypRate/project/android/com/kopfgeldjaeger/ratememaybe/RateMeMaybeFragment.java", - "/C/Developement/workspaceHaxe/HypFacebook/project/include/HypFacebook.h", - "/C/Developement/workspaceHaxe/HypFacebook/project/iPhone/HypFacebook.mm", + "/C/Developement/workspaceHaxe/HypRate/project/include/HypRate.h", + "/C/Developement/workspaceHaxe/HypRate/project/iPhone/HypRate.mm", "/C/Developement/workspaceHaxe/HypRate/project/iPhone/HypRate.mm", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_helloWorld/inc/HelloWorldApplication.h", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_helloWorld/inc/UIListener.h", "/C/Users/Johann/Downloads/Photon-Win32_v3-2-1-1_SDK/Photon-Win32_v3-2-1-1_SDK/Demos/demo_helloWorld/inc/StdIO_UIListener.h", - "/C/Developement/workspaceHaxe/HypFacebook/include.nmml", + "/C/Developement/workspaceHaxe/HypRate/include.nmml", "/C/Developement/workspaceHaxe/HypRate/project/iPhone/include/Appirater.h", "/C/Developement/workspaceHaxe/HypRate/project/iphone.sh", "/C/Developement/workspaceHaxe/HypRate/project/Build.xml", - "/C/Developement/workspaceHaxe/HypRate/project/include/HypFacebook.h", + "/C/Developement/workspaceHaxe/HypRate/project/include/HypRate.h", "/C/Developement/workspaceHaxe/HypRate/project/android/com/kot/ratememaybe/RateMeMaybe.java", "/C/Developement/workspaceHaxe/Viral3/build.hxml", "/C/Developement/workspaceHaxe/HypGA/README.md", @@ -796,18 +796,18 @@ "/C/Developement/workspaceHaxe/inthebox/src/org/shoebox/utils/NativeMirror.hx", "/C/Developement/workspaceHaxe/Viral3/src/fr/hyperfiction/viral/controllers/CGame.hx", "/C/Users/Johann/AppData/Roaming/Sublime Text 2/Packages/User/Preferences.sublime-settings", - "/C/Developement/workspaceHaxe/HypFacebook/README.md", - "/C/Developement/workspaceHaxe/HypFacebook/haxelib.xml", + "/C/Developement/workspaceHaxe/HypRate/README.md", + "/C/Developement/workspaceHaxe/HypRate/haxelib.xml", "/X/Robin/Herocorp/Videos/HC3W_C02_Valur.mov", "/C/Developement/workspaceHaxe/Viral3/src/fr/hyperfiction/viral/core/ViralAssets.hx", - "/C/Developement/workspaceHaxe/HypFacebook/LICENSE", - "/C/Developement/workspaceHaxe/HypFacebook/NOTICE", - "/C/Developement/workspaceHaxe/HypFacebook/src/fr/hyperfiction/HypFacebook.hx", - "/C/Developement/workspaceHaxe/HypFacebook/src/org/shoebox/utils/NativeMirror.hx", - "/C/Developement/workspaceHaxe/HypFacebook/src/ShortCuts.hx", - "/C/Developement/workspaceHaxe/HyperExtensions/extensions/HypFacebook/readme.md", - "/C/Developement/workspaceHaxe/HyperExtensions/extensions/HypFacebook/NOTICE", - "/C/Developement/workspaceHaxe/HyperExtensions/extensions/HypFacebook/LICENSE", + "/C/Developement/workspaceHaxe/HypRate/LICENSE", + "/C/Developement/workspaceHaxe/HypRate/NOTICE", + "/C/Developement/workspaceHaxe/HypRate/src/fr/hyperfiction/HypRate.hx", + "/C/Developement/workspaceHaxe/HypRate/src/org/shoebox/utils/NativeMirror.hx", + "/C/Developement/workspaceHaxe/HypRate/src/ShortCuts.hx", + "/C/Developement/workspaceHaxe/HyperExtensions/extensions/HypRate/readme.md", + "/C/Developement/workspaceHaxe/HyperExtensions/extensions/HypRate/NOTICE", + "/C/Developement/workspaceHaxe/HyperExtensions/extensions/HypRate/LICENSE", "/C/Users/Johann/AppData/Roaming/Sublime Text 2/Packages/Dayle Rees Color Schemes/FreshCut.tmTheme", "/C/Users/Johann/AppData/Roaming/Sublime Text 2/Packages/Dayle Rees Color Schemes/Phix Dark.tmTheme", "/C/Users/Johann/AppData/Roaming/Sublime Text 2/Packages/Dayle Rees Color Schemes/Glowfish.tmTheme", @@ -931,7 +931,7 @@ "APPIRATER_LOCALIZED_APP_NAME", "APPIRATER_CANCEL_BUTTON", "APPIRATER_LOCALIZED_MESSAGE", - "HypFacebook", + "HypRate", "Neutral", "Positive", "Dialog", diff --git a/project/android/fr/hyperfiction/HypRate.java b/project/android/fr/hyperfiction/HypRate.java index e3a1956..cb10b33 100644 --- a/project/android/fr/hyperfiction/HypRate.java +++ b/project/android/fr/hyperfiction/HypRate.java @@ -126,6 +126,6 @@ static public void setNegative_text( String s ){ * @return void */ public static void trace( String s ){ - Log.w( TAG, "HypFacebookFrag ::: "+s ); + Log.w( TAG, "HypRateFrag ::: "+s ); } -} \ No newline at end of file +} diff --git a/project/common/ExternalInterface.cpp b/project/common/ExternalInterface.cpp index a766955..9c25c9e 100644 --- a/project/common/ExternalInterface.cpp +++ b/project/common/ExternalInterface.cpp @@ -21,7 +21,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND extern "C"{ int HypRate_register_prims(){ - printf("HypFacebook : register_prims()\n"); + printf("HypRate : register_prims()\n"); return 0; } } @@ -37,44 +37,44 @@ extern "C"{ #ifdef IPHONE value HypRate_setDialog_title( value s ) { - setDialog_title( val_string( s ) ); + Hyperfiction::setDialog_title( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setDialog_title , 1 ); value HypRate_setDialog_msg( value s ) { - setDialog_msg( val_string( s ) ); + Hyperfiction::setDialog_msg( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setDialog_msg , 1 ); value HypRate_setPositive_text( value s ) { - setPositive_text( val_string( s ) ); + Hyperfiction::setPositive_text( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setPositive_text , 1 ); value HypRate_setNeutral_text( value s ) { - setNeutral_text( val_string( s ) ); + Hyperfiction::setNeutral_text( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setNeutral_text , 1 ); value HypRate_setNegative_text( value s ) { - setCancel_text( val_string( s ) ); + Hyperfiction::setCancel_text( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setNegative_text , 1 ); value HypRate_start( value minL , value minD , value untilL , value untilD ){ - start( val_int( minL ) , val_int( minD ) , val_int( untilL ) , val_int( untilD )); + Hyperfiction::start( val_int( minL ) , val_int( minD ) , val_int( untilL ) , val_int( untilD )); return alloc_null( ); } DEFINE_PRIM( HypRate_start , 4 ); value HypRate_show( ){ - show( ); - return alloc_nul( ); + Hyperfiction::show( ); + return alloc_null( ); } DEFINE_PRIM( HypRate_show , 0 ); From c91180dd7705566a3563cb0b51fd2838fa2883ae Mon Sep 17 00:00:00 2001 From: Joshua Date: Wed, 9 Oct 2013 19:07:42 -0400 Subject: [PATCH 2/2] Remove changes to interface file to save for ios fix branch --- project/common/ExternalInterface.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/project/common/ExternalInterface.cpp b/project/common/ExternalInterface.cpp index 9c25c9e..10cb7a4 100644 --- a/project/common/ExternalInterface.cpp +++ b/project/common/ExternalInterface.cpp @@ -37,44 +37,44 @@ extern "C"{ #ifdef IPHONE value HypRate_setDialog_title( value s ) { - Hyperfiction::setDialog_title( val_string( s ) ); + setDialog_title( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setDialog_title , 1 ); value HypRate_setDialog_msg( value s ) { - Hyperfiction::setDialog_msg( val_string( s ) ); + setDialog_msg( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setDialog_msg , 1 ); value HypRate_setPositive_text( value s ) { - Hyperfiction::setPositive_text( val_string( s ) ); + setPositive_text( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setPositive_text , 1 ); value HypRate_setNeutral_text( value s ) { - Hyperfiction::setNeutral_text( val_string( s ) ); + setNeutral_text( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setNeutral_text , 1 ); value HypRate_setNegative_text( value s ) { - Hyperfiction::setCancel_text( val_string( s ) ); + setCancel_text( val_string( s ) ); return alloc_null( ); } DEFINE_PRIM( HypRate_setNegative_text , 1 ); value HypRate_start( value minL , value minD , value untilL , value untilD ){ - Hyperfiction::start( val_int( minL ) , val_int( minD ) , val_int( untilL ) , val_int( untilD )); + start( val_int( minL ) , val_int( minD ) , val_int( untilL ) , val_int( untilD )); return alloc_null( ); } DEFINE_PRIM( HypRate_start , 4 ); value HypRate_show( ){ - Hyperfiction::show( ); - return alloc_null( ); + show( ); + return alloc_nul( ); } DEFINE_PRIM( HypRate_show , 0 );