salmon-engine-core/engine
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor bug fixing

Browse Source
This commit is contained in:
Vladislav Khorev 2017-01-10 10:52:51 +03:00
parent 99a6b3728d
commit ed112a5484
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SalmonEngineAndroid/.gitignore vendored
View File

@ -1,6 +1,7 @@
*.iml *.iml
.gradle .gradle
/local.properties /local.properties
.idea
/.idea/workspace.xml /.idea/workspace.xml
/.idea/libraries /.idea/libraries
.DS_Store .DS_Store

11
SalmonEngineAndroid/app/src/main/AndroidManifest.xml
View File

@ -1,17 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fishrungames.salmonengineandroid"> package="fishrungames.salmonengineandroid">
<application android:allowBackup="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:screenOrientation="landscape"
android:launchMode="singleTask"
android:configChanges="orientation|keyboardHidden"
android:noHistory="true">
</application>
<uses-feature android:glEsVersion="0x00020000"/> <uses-feature android:glEsVersion="0x00020000"/>
</manifest> </manifest>

5
src/Utils/Console/Console.cpp
View File

@ -71,6 +71,7 @@ void TSimpleConsole::Draw()
void TSimpleConsole::CutHistory() void TSimpleConsole::CutHistory()
{ {
/*
cardinal i = 0; cardinal i = 0;
cardinal pos = std::string::npos; cardinal pos = std::string::npos;
@ -90,7 +91,7 @@ void TSimpleConsole::CutHistory()
if (pos != std::string::npos) if (pos != std::string::npos)
{ {
History = History.substr(pos); History = History.substr(pos);
} }*/
} }
std::string TSimpleConsole::GetHistory() std::string TSimpleConsole::GetHistory()
@ -234,7 +235,7 @@ TJavaConsole& TJavaConsole::operator<<(const std::string& s)
CutHistory(); CutHistory();
__android_log_print(ANDROID_LOG_VERBOSE, APPNAME, "%s", string_with_time_mark.c_str()); //__android_log_print(ANDROID_LOG_VERBOSE, APPNAME, "%s", string_with_time_mark.c_str());