mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-25 14:27:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix subtitle console spam + font shadow offseting (#2822)

Browse Source
This commit is contained in:
ManDude
2023-07-10 07:32:35 +01:00
committed by GitHub
parent c87db7e670
commit 95d706e339
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/mips2c/jak2_functions/font.cpp
+8 -2
View File
@@ -665,8 +665,14 @@ u64 execute(void* ctxt) {
c->load_symbol2(v1, cache.math_camera); // lw v1, *math-camera*(s7)
c->lqc2(vf26, 812, v1); // lqc2 vf26, 812(v1)
c->lqc2(vf27, 812, v1); // lqc2 vf27, 812(v1)
c->vadd_bc(DEST::xy, BC::w, vf26, vf26, vf0); // vaddw.xy vf26, vf26, vf0
c->vadd_bc(DEST::x, BC::w, vf26, vf26, vf0); // vaddw.x vf26, vf26, vf0
// shadow hack begin
c->load_symbol2(v1, cache.video_params);
c->lw(t0, 16, v1);
c->vfs[vf26].f[0] += c->gprs[t0].f[0] * 2;
c->vfs[vf26].f[1] += 1;
// c->vadd_bc(DEST::xy, BC::w, vf26, vf26, vf0); // vaddw.xy vf26, vf26, vf0
// c->vadd_bc(DEST::x, BC::w, vf26, vf26, vf0); // vaddw.x vf26, vf26, vf0
// shadow hack end
c->lw(v1, 68, a2); // lw v1, 68(a2)
c->lqc2(vf25, 44, a2); // lqc2 vf25, 44(a2)
c->lqc2(vf23, 12, a2); // lqc2 vf23, 12(a2)
goal_src/jak2/pc/subtitle2.gc
+6 -6
View File
@@ -418,7 +418,7 @@
(when (-> self queue i gui)
(let ((pos (current-subtitle2-pos (-> self queue i id))))
(when (and (zero? q) *debug-segment*)
(format *stdcon* "subtitle pos: ~3L~D~0L (~S)~%" (the int pos) (-> self queue i gui name)))
(format *stdcon0* "subtitle pos: ~3L~D~0L (~S)~%" (the int pos) (-> self queue i gui name)))
(let ((scene (get-scene-by-name *subtitle2-text* (-> self queue i gui name))))
(when scene
@@ -500,21 +500,21 @@
(when *debug-segment*
(defmethod debug-print-queue subtitle2 ((self subtitle2))
"print the queue to *stdcon*"
"print the queue to *stdcon0*"
(format *stdcon* "q: ~%")
(format *stdcon0* "q: ~%")
(dotimes (i PC_SUBTITLE_QUEUE_SIZE)
(if (-> self queue i gui)
(format *stdcon* "~D: ~S ~3L~D~0L ~D ~`gui-connection`P~%" i
(format *stdcon0* "~D: ~S ~3L~D~0L ~D ~`gui-connection`P~%" i
(-> self queue i gui name)
(the int (current-subtitle2-pos (-> self queue i id)))
(-> self queue i id)
(-> self queue i gui))))
(format *stdcon* "l: ~%")
(format *stdcon0* "l: ~%")
(let ((line-queue (if (zero? (-> self line-queue-idx)) (-> self lines 0) (-> self lines 1))))
(dotimes (i PC_SUBTITLE_MAX_LINES)
(format *stdcon* "~D: ~D ~S~%" i (the int (-> line-queue elts i y)) (aif (-> line-queue elts i line) (-> it text)))))
(format *stdcon0* "~D: ~D ~S~%" i (the int (-> line-queue elts i y)) (aif (-> line-queue elts i line) (-> it text)))))
0)