提交: c181368b29bbfd8ad1ccd7cd76982ee939d66cf5 - ikemen (git)

Commit MetaInfo

• 修订版: c181368b29bbfd8ad1ccd7cd76982ee939d66cf5 (tree)
• 时间: 2017-01-27 21:34:34
• 作者: SUEHIRO <supersuehiro@user...>
• Commiter: SUEHIRO

Log Message

allpalfxのフォントの表示の修正と、xscaleがマイナスのときの処理の修正

更改概述

• modified: ssz/action.ssz
• modified: ssz/char.ssz
• modified: ssz/fighting.ssz
• modified: ssz/font.ssz

差异

--- a/ssz/action.ssz
+++ b/ssz/action.ssz
@@ -175,24 +175,21 @@ public &DrawnClsn
       y = `y + `yscale*(float)`clsn[i].t + (float)(.com.GameHeight-240);
       w = (float)`clsn[i].r - (float)`clsn[i].l;
       h = (float)`clsn[i].b - (float)`clsn[i].t;
-      if(`xscale < 0.0){
-        x *= -1.0;
-        x += 160.0*2.0;
-      }
+      if(`xscale < 0.0) x *= -1.0;
       if(`yscale < 0.0) y *= -1.0;
     /?/*.cfg.OpenGL:
       .sdl.RenderMugenGl(:
         spr.pxl<>, spr.colorPallet<>=, -1, spr.rct=,
-        (-x+160.0)*.com.WidthScale, -y*.com.HeightScale, til=,
+        -x*.com.WidthScale, -y*.com.HeightScale, til=,
         `xscale*.com.WidthScale*w, `xscale*.com.WidthScale*w,
         `yscale*.com.WidthScale*h, 1.0, 0.0, 0.0, alpha, .com.scrrect=,
-        .com.WidthScale*160.0, 0.0:);
+        0.0, 0.0:);
     /*true:
       {
         %byte dammy;
         .sdl.renderMugenZoom(
-          .com.scrrect=, .com.WidthScale*160.0, 0.0, spr.pxl, spr.colorPallet,
-          -1, spr.rct=, (-x+160.0)*.com.WidthScale, -y*.com.HeightScale, til=,
+          .com.scrrect=, 0.0, 0.0, spr.pxl, spr.colorPallet,
+          -1, spr.rct=, -x*.com.WidthScale, -y*.com.HeightScale, til=,
           `xscale*.com.WidthScale*w, `xscale*.com.WidthScale*w,
           `yscale*.com.WidthScale*h, 0.0, 0d0, alpha, spr.rle, spr.pluginbuf=);
       }

--- a/ssz/char.ssz
+++ b/ssz/char.ssz
@@ -1884,9 +1884,10 @@ public &Projectile
     ^&.act.Rect clsn1 = pr.ani~ani.currentFrame()=>frm$frm~clsn2();
     ^&.act.Rect clsn2 = `ani~ani.currentFrame()=>frm$frm~clsn2();
     &.ClsnHantei ch.set(
-      pr.clsnscalex, pr.clsnscaley, pr.x, pr.y,
-      pr.facing > 0 ? .pLrSet : .mLrSet,
-      `clsnscalex, `clsnscaley, `x, `y, `facing > 0 ? .pLrSet : .mLrSet);
+      #pr.clsnscalex, pr.clsnscaley, pr.x, pr.y,
+      (float)pr.facing*pr.clsnscalex > 0.0 ? .pLrSet : .mLrSet,
+      #`clsnscalex, `clsnscaley, `x, `y,
+      (float)`facing*`clsnscalex > 0.0 ? .pLrSet : .mLrSet);
     loop{index i = 0; while; do:
       loop{index j = 0; while; do:
         if(ch.hantei(clsn1[i], clsn2[j])) ret true;
@@ -2874,12 +2875,12 @@ public &Char
     ^&.act.Rect clsn1 = c1atk ? atk.curFrame~clsn1() : atk.curFrame~clsn2();
     ^&.act.Rect clsn2 = c1slf ? `curFrame~clsn1() : `curFrame~clsn2();
     &.ClsnHantei ch.set(
-      atk.sysfvar[.fCLSNXSCALE], atk.sysfvar[.fCLSNYSCALE],
+      #atk.sysfvar[.fCLSNXSCALE], atk.sysfvar[.fCLSNYSCALE],
       atk.sysfvar[.fX] + atk.offsetX(), atk.sysfvar[.fY] + atk.offsetY(),
-      atk.facing > 0 ? .pLrSet : .mLrSet,
-      `sysfvar[.fCLSNXSCALE], `sysfvar[.fCLSNYSCALE],
+      (float)atk.facing*atk.sysfvar[.fCLSNXSCALE] > 0.0 ? .pLrSet : .mLrSet,
+      #`sysfvar[.fCLSNXSCALE], `sysfvar[.fCLSNYSCALE],
       `sysfvar[.fX] + `offsetX(), `sysfvar[.fY] + `offsetY(),
-      `facing > 0 ? .pLrSet : .mLrSet);
+      (float)`facing*`sysfvar[.fCLSNXSCALE] > 0.0 ? .pLrSet : .mLrSet);
     loop{index i = 0; while; do:
       loop{index j = 0; while; do:
         if(ch.hantei(clsn1[i], clsn2[j])) ret true;
@@ -2900,11 +2901,11 @@ public &Char
     ^&.act.Rect clsn1 = pr.ani~ani.currentFrame()=>frm$frm~clsn1();
     ^&.act.Rect clsn2 = `curFrame~clsn2();
     &.ClsnHantei ch.set(
-      pr.clsnscalex, pr.clsnscaley, pr.x, pr.y,
-      pr.facing > 0 ? .pLrSet : .mLrSet,
-      `sysfvar[.fCLSNXSCALE], `sysfvar[.fCLSNYSCALE],
+      #pr.clsnscalex, pr.clsnscaley, pr.x, pr.y,
+      (float)pr.facing*pr.clsnscalex > 0.0 ? .pLrSet : .mLrSet,
+      #`sysfvar[.fCLSNXSCALE], `sysfvar[.fCLSNYSCALE],
       `sysfvar[.fX] + `offsetX(), `sysfvar[.fY] + `offsetY(),
-      `facing > 0 ? .pLrSet : .mLrSet);
+      (float)`facing*`sysfvar[.fCLSNXSCALE] > 0.0 ? .pLrSet : .mLrSet);
     loop{index i = 0; while; do:
       loop{index j = 0; while; do:
         if(ch.hantei(clsn1[i], clsn2[j])) ret true;
@@ -2923,11 +2924,11 @@ public &Char
     ^&.act.Rect clsn1 = pr.ani~ani.currentFrame()=>frm$frm~clsn2();
     ^&.act.Rect clsn2 = `curFrame~clsn1();
     &.ClsnHantei ch.set(
-      pr.clsnscalex, pr.clsnscaley, pr.x, pr.y,
-      pr.facing > 0 ? .pLrSet : .mLrSet,
-      `sysfvar[.fCLSNXSCALE], `sysfvar[.fCLSNYSCALE],
+      #pr.clsnscalex, pr.clsnscaley, pr.x, pr.y,
+      (float)pr.facing*pr.clsnscalex > 0.0 ? .pLrSet : .mLrSet,
+      #`sysfvar[.fCLSNXSCALE], `sysfvar[.fCLSNYSCALE],
       `sysfvar[.fX] + `offsetX(), `sysfvar[.fY] + `offsetY(),
-      `facing > 0 ? .pLrSet : .mLrSet);
+      (float)`facing*`sysfvar[.fCLSNXSCALE] > 0.0 ? .pLrSet : .mLrSet);
     loop{index i = 0; while; do:
       loop{index j = 0; while; do:
         if(ch.hantei(clsn1[i], clsn2[j])) ret true;

--- a/ssz/fighting.ssz
+++ b/ssz/fighting.ssz
@@ -137,8 +137,8 @@ void game()
 {
   void put(float y=, ^/char txt)
   {
-    int tmp = .sff.allPalFX~time;
-    .sff.allPalFX~time = 0;
+    bool tmp = .sff.allPalFX~enable;
+    .sff.allPalFX~enable = false;
     loop{
       ^/char t = txt;
       index i;
@@ -156,7 +156,7 @@ void game()
         1.0/.com.WidthScale,  1.0/.com.HeightScale, 0, 1, t[0..i]);
       t = t[i..-1];
     while #t > 0:}
-    .sff.allPalFX~time = tmp;
+    .sff.allPalFX~enable = tmp;
   }
   %char line;
   void drawDebug()

--- a/ssz/font.ssz
+++ b/ssz/font.ssz
@@ -274,7 +274,7 @@ public &Font
       dx -= (float)`textWidth(txt)*xscl;
     }
     ^uint pal = `mpl~img[bank].colorPallet;
-    if(.sff.allPalFX~time != 0) pal = .sff.allPalFX~getFxPal(pal, false);
+    if(.sff.allPalFX~enable) pal = .sff.allPalFX~getFxPal(pal, false);
     txt:<-[void(c){
       dx +=
         `drawChar(dx, dy, xscl, yscl, bank, c, pal=) + (float)`spacingx*xscl;