diff --git a/engine/Makefile b/engine/Makefile index 1622d955f..b2dbdd435 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -92,6 +92,9 @@ endif 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_HOME?=~/android-sdk-linux ANT?=ant diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 7ea157c05..328583727 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -3645,8 +3645,6 @@ void Host_BeginFileDownload(struct dl_download *dl, char *mimetype) // 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)) { 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) // CL_PlayDemoStream((dl->file = VFSPIPE_Open()), dl, f->fname, DPB_NETQUAKE, 0); #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) Con_Printf("%s: format not supported\n", f->fname); //demos that are not supported in this build for one reason or another else diff --git a/engine/droid/autoexec.cfg b/engine/droid/autoexec.cfg new file mode 100644 index 000000000..0037627f8 --- /dev/null +++ b/engine/droid/autoexec.cfg @@ -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. diff --git a/engine/http/httpclient.c b/engine/http/httpclient.c index 5720270f9..1cd6b2b2d 100644 --- a/engine/http/httpclient.c +++ b/engine/http/httpclient.c @@ -523,7 +523,10 @@ static qboolean HTTP_DL_Work(struct dl_download *dl) #endif if (!dl->file) { - Con_Printf("HTTP: Couldn't open file \"%s\"\n", dl->localname); + if (*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; return false; }