add a default autoexec.cfg for android at mushi's request.
add temp(ish) workaround for non-functioning tmpfile libc function on android. clarified the error message displayed when tmpfile fails. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4554 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
f438694f28
commit
d75ef8869e
4 changed files with 34 additions and 3 deletions
|
@ -92,6 +92,9 @@ endif
|
||||||
|
|
||||||
USER_TARGET:=$(FTE_TARGET)
|
USER_TARGET:=$(FTE_TARGET)
|
||||||
|
|
||||||
|
#make droid-rel doesn't get the right stuff
|
||||||
|
#add an autoexec file. its only small.
|
||||||
|
DROID_PACKSU?= $(BASE_DIR)/droid/autoexec.cfg
|
||||||
ANDROID_NDK_ROOT?=~/android-ndk-r8e
|
ANDROID_NDK_ROOT?=~/android-ndk-r8e
|
||||||
ANDROID_HOME?=~/android-sdk-linux
|
ANDROID_HOME?=~/android-sdk-linux
|
||||||
ANT?=ant
|
ANT?=ant
|
||||||
|
|
|
@ -3645,8 +3645,6 @@ void Host_BeginFileDownload(struct dl_download *dl, char *mimetype)
|
||||||
// f->flags |= HRF_PACKAGE;
|
// f->flags |= HRF_PACKAGE;
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME: HRF_DEMO should be able to stream. create a vfs pipe for the download code to write to?
|
|
||||||
|
|
||||||
if (!(f->flags & HRF_FILETYPES))
|
if (!(f->flags & HRF_FILETYPES))
|
||||||
{
|
{
|
||||||
char *ext = COM_FileExtension(f->fname);
|
char *ext = COM_FileExtension(f->fname);
|
||||||
|
@ -3691,6 +3689,12 @@ void Host_BeginFileDownload(struct dl_download *dl, char *mimetype)
|
||||||
// else if (f->flags & HRF_DEMO_DEM)
|
// else if (f->flags & HRF_DEMO_DEM)
|
||||||
// CL_PlayDemoStream((dl->file = VFSPIPE_Open()), dl, f->fname, DPB_NETQUAKE, 0);
|
// CL_PlayDemoStream((dl->file = VFSPIPE_Open()), dl, f->fname, DPB_NETQUAKE, 0);
|
||||||
#endif
|
#endif
|
||||||
|
else if (f->flags & (HRF_MANIFEST | HRF_QTVINFO))
|
||||||
|
{
|
||||||
|
//just use a pipe instead of a temp file, working around an issue with temp files on android
|
||||||
|
dl->file = VFSPIPE_Open();
|
||||||
|
return;
|
||||||
|
}
|
||||||
else if (f->flags & HRF_DEMO)
|
else if (f->flags & HRF_DEMO)
|
||||||
Con_Printf("%s: format not supported\n", f->fname); //demos that are not supported in this build for one reason or another
|
Con_Printf("%s: format not supported\n", f->fname); //demos that are not supported in this build for one reason or another
|
||||||
else
|
else
|
||||||
|
|
21
engine/droid/autoexec.cfg
Normal file
21
engine/droid/autoexec.cfg
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
// FTEDroid autoexec.cfg
|
||||||
|
// [Spike: file supplied by mushi]
|
||||||
|
// i [mushi] believe this is more user friendly, at least to spectate a qtv (which, i believe, will be the most used feature of ftedroid.
|
||||||
|
|
||||||
|
|
||||||
|
// (for reference) creating links on the console:
|
||||||
|
// ^[sometext\join\127.0.0.1:27500^] can be used to connect to some server
|
||||||
|
// ^[sometext\observe\127.0.0.1:27500^] can be used to observe some server (not qtv)
|
||||||
|
|
||||||
|
|
||||||
|
echo Possible keys to bind: {"APP"}, {"MENU"}, {"SEARCH"}, {"POWER"}, {"VOLUP"}, {"VOLDOWN"}
|
||||||
|
|
||||||
|
|
||||||
|
bind mouse1 +attack //left area of the screen
|
||||||
|
bind mouse2 +jump //right area of the screen
|
||||||
|
bind menu "toggleconsole" //is there a better "key" to toggle the console??
|
||||||
|
|
||||||
|
bind volup +showteamscores
|
||||||
|
// bind voldown +jump //removed because on most android devices power+voldown takes a screenshot
|
||||||
|
|
||||||
|
vid_conautoscale "3" //doesn't seem to work on autoexec. just on exec.
|
|
@ -523,7 +523,10 @@ static qboolean HTTP_DL_Work(struct dl_download *dl)
|
||||||
#endif
|
#endif
|
||||||
if (!dl->file)
|
if (!dl->file)
|
||||||
{
|
{
|
||||||
|
if (*dl->localname)
|
||||||
Con_Printf("HTTP: Couldn't open file \"%s\"\n", dl->localname);
|
Con_Printf("HTTP: Couldn't open file \"%s\"\n", dl->localname);
|
||||||
|
else
|
||||||
|
Con_Printf("HTTP: Couldn't open temporary file\n");
|
||||||
dl->status = DL_FAILED;
|
dl->status = DL_FAILED;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue