[Scummvm-cvs-logs] scummvm master -> c3463e77d2d7453e15c703a15df6e44745c7b6b4

[zeldin]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
22c74bf23e DC: Aesthetical improvements to plugin loader
c3463e77d2 DC: Create a "dcdist" target for buildbot


Commit: 22c74bf23ec24ed5d5b881f093eb732eb61c60e2
    https://github.com/scummvm/scummvm/commit/22c74bf23ec24ed5d5b881f093eb732eb61c60e2
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2011-04-29T13:22:58-07:00

Commit Message:
DC: Aesthetical improvements to plugin loader

Changed paths:
    backends/platform/dc/plugins.cpp



diff --git a/backends/platform/dc/plugins.cpp b/backends/platform/dc/plugins.cpp
index be329ab..44b8960 100644
--- a/backends/platform/dc/plugins.cpp
+++ b/backends/platform/dc/plugins.cpp
@@ -39,6 +39,7 @@ static void drawPluginProgress(const Common::String &filename)
 {
   ta_sync();
   void *mark = ta_txmark();
+  const char *fn = filename.c_str();
   Label lab1, lab2, lab3;
   char buf[32];
   unsigned memleft = 0x8cf00000-((unsigned)sbrk(0));
@@ -46,20 +47,21 @@ static void drawPluginProgress(const Common::String &filename)
   int fcol = (memleft < (1<<20)? 0xffff0000:
 	      (memleft < (4<<20)? 0xffffff00: 0xff00ff00));
   snprintf(buf, sizeof(buf), "%dK free memory", memleft>>10);
+  if (fn[0] == '/') fn++;
   lab1.create_texture("Loading plugins, please wait...");
-  lab2.create_texture(filename.c_str());
+  lab2.create_texture(fn);
   lab3.create_texture(buf);
   ta_begin_frame();
-  draw_solid_quad(80.0, 320.0, 560.0, 350.0,
+  draw_solid_quad(80.0, 270.0, 560.0, 300.0,
 		  0xff808080, 0xff808080, 0xff808080, 0xff808080);
-  draw_solid_quad(85.0, 325.0, 555.0, 345.0, 
+  draw_solid_quad(85.0, 275.0, 555.0, 295.0, 
 		  0xff202020, 0xff202020, 0xff202020, 0xff202020);
-  draw_solid_quad(85.0, 325.0, 85.0+470.0*ffree, 345.0,
+  draw_solid_quad(85.0, 275.0, 85.0+470.0*ffree, 295.0,
 		  fcol, fcol, fcol, fcol);
   ta_commit_end();
-  lab1.draw(100.0, 200.0, 0xffffffff);
-  lab2.draw(100.0, 240.0, 0xffffffff);
-  lab3.draw(100.0, 280.0, 0xffffffff);
+  lab1.draw(100.0, 150.0, 0xffffffff);
+  lab2.draw(100.0, 190.0, 0xffaaffaa);
+  lab3.draw(100.0, 230.0, 0xffffffff);
   ta_commit_frame();
   ta_sync();
   ta_txrelease(mark);


Commit: c3463e77d2d7453e15c703a15df6e44745c7b6b4
    https://github.com/scummvm/scummvm/commit/c3463e77d2d7453e15c703a15df6e44745c7b6b4
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2011-04-29T13:25:09-07:00

Commit Message:
DC: Create a "dcdist" target for buildbot

The "dcdist" target creates the directory dcdist/scummvm and copies
relevant files from the nightly build into it.  This is is they do
not have to be enumerated in the buildbot configuration.

Changed paths:
    backends/platform/dc/dreamcast.mk



diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk
index 8651a29..666e03e 100644
--- a/backends/platform/dc/dreamcast.mk
+++ b/backends/platform/dc/dreamcast.mk
@@ -35,3 +35,7 @@ ip.txt : $(srcdir)/backends/platform/dc/ip.txt.in
 	  ver="V$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)"; fi; \
 	sed -e 's/[@]VERSION[@]/'"$$ver"/ -e 's/[@]DATE[@]/$(shell date '+%Y%m%d')/' < $< > $@
 
+
+dcdist : dist
+	mkdir -p dcdist/scummvm
+	cp scummvm.elf SCUMMVM.BIN IP.BIN *.PLG dcdist/scummvm/