Modified pixel font to incorporate a copyright symbol. Removed copyright unicode character from credits file to avoid out-of-bounds check. Added copyright symbols to credits and splash screen.
This commit is contained in:
parent
de82e3f913
commit
585cd209be
@ -3148,6 +3148,8 @@ void AiL::InitializeGraphics(){
|
|||||||
}
|
}
|
||||||
std::cout<<VisualNovel::graphicsToLoad.size()<<" images for visual novel engine have been loaded."<<std::endl;
|
std::cout<<VisualNovel::graphicsToLoad.size()<<" images for visual novel engine have been loaded."<<std::endl;
|
||||||
|
|
||||||
|
SetFontSprite("GFX_Prefix"_S+"font.png");
|
||||||
|
|
||||||
Menu::themes.SetInitialized();
|
Menu::themes.SetInitialized();
|
||||||
std::cout<<Menu::themes.size()<<" themes have been loaded."<<std::endl;
|
std::cout<<Menu::themes.size()<<" themes have been loaded."<<std::endl;
|
||||||
GFX.SetInitialized();
|
GFX.SetInitialized();
|
||||||
|
@ -218,6 +218,7 @@ protected:
|
|||||||
if(game->GetMouse(0).bHeld&&!geom2d::contains(rect,bounds)&&
|
if(game->GetMouse(0).bHeld&&!geom2d::contains(rect,bounds)&&
|
||||||
geom2d::overlaps(geom2d::rect<float>(windowAbsPos+vf2d{rect.size.x-12.f,12.f},{12.f,rect.size.y-12.f}),game->GetMousePos())){
|
geom2d::overlaps(geom2d::rect<float>(windowAbsPos+vf2d{rect.size.x-12.f,12.f},{12.f,rect.size.y-12.f}),game->GetMousePos())){
|
||||||
ScrollToClickedPosition();
|
ScrollToClickedPosition();
|
||||||
|
scrollBarSelected=true;
|
||||||
Menu::menus[parentMenu]->alreadyClicked=true;
|
Menu::menus[parentMenu]->alreadyClicked=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ All rights reserved.
|
|||||||
#define VERSION_MAJOR 0
|
#define VERSION_MAJOR 0
|
||||||
#define VERSION_MINOR 5
|
#define VERSION_MINOR 5
|
||||||
#define VERSION_PATCH 1
|
#define VERSION_PATCH 1
|
||||||
#define VERSION_BUILD 8155
|
#define VERSION_BUILD 8165
|
||||||
|
|
||||||
#define stringify(a) stringify_(a)
|
#define stringify(a) stringify_(a)
|
||||||
#define stringify_(a) #a
|
#define stringify_(a) #a
|
||||||
|
@ -23,14 +23,14 @@ Credits
|
|||||||
LINE[20]="#FE9900javidx9#FFFFFF"
|
LINE[20]="#FE9900javidx9#FFFFFF"
|
||||||
LINE[21]="#FEF500olc::PixelGameEngine v.2.25#FFFFFF"
|
LINE[21]="#FEF500olc::PixelGameEngine v.2.25#FFFFFF"
|
||||||
LINE[22]=" "
|
LINE[22]=" "
|
||||||
LINE[23]="olcPGEX_MiniAudio Copyright© 2024 by Moros Smith under the OLC-3 License"
|
LINE[23]="olcPGEX_MiniAudio Copyright` 2024 by Moros Smith under the OLC-3 License"
|
||||||
LINE[24]=" "
|
LINE[24]=" "
|
||||||
LINE[25]="olcPGEX_ViewPort by Gorbit99"
|
LINE[25]="olcPGEX_ViewPort by Gorbit99"
|
||||||
LINE[26]=" "
|
LINE[26]=" "
|
||||||
LINE[27]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License"
|
LINE[27]="miniaudio library Copyright` 2024 by David Reid under the MIT No Attribution License"
|
||||||
LINE[28]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/"
|
LINE[28]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/"
|
||||||
LINE[29]=" "
|
LINE[29]=" "
|
||||||
LINE[30]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved."
|
LINE[30]="Portions of this software are copyright ` 2024 The FreeType Project (www.freetype.org). All rights reserved."
|
||||||
LINE[31]=" "
|
LINE[31]=" "
|
||||||
LINE[32]="Assets"
|
LINE[32]="Assets"
|
||||||
LINE[33]="~~~~~~~~~~~~~~~~"
|
LINE[33]="~~~~~~~~~~~~~~~~"
|
||||||
@ -57,7 +57,7 @@ Credits
|
|||||||
LINE[54]="License (OLC-3)"
|
LINE[54]="License (OLC-3)"
|
||||||
LINE[55]="~~~~~~~~~~~~~~~"
|
LINE[55]="~~~~~~~~~~~~~~~"
|
||||||
LINE[56]=" "
|
LINE[56]=" "
|
||||||
LINE[57]="Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>"
|
LINE[57]="Copyright ` 2024 Sig Productions <niconiconii@lestoria.net>"
|
||||||
LINE[58]=" "
|
LINE[58]=" "
|
||||||
LINE[59]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:"
|
LINE[59]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:"
|
||||||
LINE[60]=" "
|
LINE[60]=" "
|
||||||
@ -68,4 +68,9 @@ Credits
|
|||||||
LINE[65]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission."
|
LINE[65]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission."
|
||||||
LINE[66]=" "
|
LINE[66]=" "
|
||||||
LINE[67]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
LINE[67]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||||
|
LINE[68]=" "
|
||||||
|
LINE[69]=" "
|
||||||
|
LINE[70]=" "
|
||||||
|
LINE[71]=" "
|
||||||
|
LINE[72]=" "
|
||||||
}
|
}
|
@ -83,6 +83,7 @@ Images
|
|||||||
GFX_Lock = lock.png
|
GFX_Lock = lock.png
|
||||||
GFX_Unlock = unlock.png
|
GFX_Unlock = unlock.png
|
||||||
GFX_SwordSlash = swordslash.png
|
GFX_SwordSlash = swordslash.png
|
||||||
|
GFX_CustomFont = font.png
|
||||||
|
|
||||||
# Ability Icons
|
# Ability Icons
|
||||||
GFX_Warrior_BattleCry_Icon = Ability Icons/battlecry.png
|
GFX_Warrior_BattleCry_Icon = Ability Icons/battlecry.png
|
||||||
|
BIN
Adventures in Lestoria/assets/font.png
Normal file
BIN
Adventures in Lestoria/assets/font.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
@ -210,8 +210,8 @@ namespace olc
|
|||||||
pge->DrawPartialDecal(vScale * vBoom[y * spr.Sprite()->width + x].first * 2.0f, spr.Decal(), olc::vf2d(x, y), { 1, 1 }, vScale * 2.0f, olc::PixelF(1.0f, 1.0f, 1.0f, std::min(1.0f, std::max(4.0f - fParticleTime, 0.0f))));
|
pge->DrawPartialDecal(vScale * vBoom[y * spr.Sprite()->width + x].first * 2.0f, spr.Decal(), olc::vf2d(x, y), { 1, 1 }, vScale * 2.0f, olc::PixelF(1.0f, 1.0f, 1.0f, std::min(1.0f, std::max(4.0f - fParticleTime, 0.0f))));
|
||||||
}
|
}
|
||||||
|
|
||||||
olc::vi2d vSize = pge->GetTextSizeProp("Copyright OneLoneCoder.com 2024");
|
olc::vi2d vSize = pge->GetTextSizeProp("Copyright ` OneLoneCoder.com 2024");
|
||||||
pge->DrawStringPropDecal(olc::vf2d(float(pge->ScreenWidth()/2) - vSize.x/2, float(pge->ScreenHeight()) - vSize.y * 3.0f), "Copyright OneLoneCoder.com 2024", olc::PixelF(1.0f, 1.0f, 1.0f, 0.5f), olc::vf2d(1.0, 2.0f));
|
pge->DrawStringPropDecal(olc::vf2d(float(pge->ScreenWidth()/2) - vSize.x/2, float(pge->ScreenHeight()) - vSize.y * 3.0f), "Copyright ` OneLoneCoder.com 2024", olc::PixelF(1.0f, 1.0f, 1.0f, 0.5f), olc::vf2d(1.0, 2.0f));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1223,6 +1223,7 @@ namespace olc
|
|||||||
olc::Sprite* GetFontSprite();
|
olc::Sprite* GetFontSprite();
|
||||||
// Returns the font image
|
// Returns the font image
|
||||||
olc::Decal* GetFontDecal();
|
olc::Decal* GetFontDecal();
|
||||||
|
void SetFontSprite(std::string_view filename);
|
||||||
|
|
||||||
// Clip a line segment to visible area
|
// Clip a line segment to visible area
|
||||||
bool ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2);
|
bool ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2);
|
||||||
@ -2592,6 +2593,8 @@ namespace olc
|
|||||||
{ return fontRenderable.Sprite(); }
|
{ return fontRenderable.Sprite(); }
|
||||||
olc::Decal* PixelGameEngine::GetFontDecal()
|
olc::Decal* PixelGameEngine::GetFontDecal()
|
||||||
{ return fontRenderable.Decal(); }
|
{ return fontRenderable.Decal(); }
|
||||||
|
void PixelGameEngine::SetFontSprite(std::string_view filename)
|
||||||
|
{ fontRenderable.Load(std::string(filename)); }
|
||||||
|
|
||||||
bool PixelGameEngine::ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2)
|
bool PixelGameEngine::ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2)
|
||||||
{
|
{
|
||||||
@ -4986,7 +4989,7 @@ namespace olc
|
|||||||
0x08,0x17,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x24,0x15,0x06,0x07,0x16,0x17,
|
0x08,0x17,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x24,0x15,0x06,0x07,0x16,0x17,
|
||||||
0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x17,0x08,0x08,0x08,
|
0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x17,0x08,0x08,0x08,
|
||||||
0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x08,0x08,0x17,0x08,0x15,0x08,0x15,0x08,0x08,
|
0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x08,0x08,0x17,0x08,0x15,0x08,0x15,0x08,0x08,
|
||||||
0x24,0x18,0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x33,0x17,0x17,0x33,0x18,0x17,0x17,
|
0x09,0x18,0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x33,0x17,0x17,0x33,0x18,0x17,0x17,
|
||||||
0x17,0x17,0x17,0x17,0x07,0x17,0x17,0x18,0x18,0x17,0x17,0x07,0x33,0x07,0x08,0x00, } };
|
0x17,0x17,0x17,0x17,0x07,0x17,0x17,0x18,0x18,0x17,0x17,0x07,0x33,0x07,0x08,0x00, } };
|
||||||
|
|
||||||
for (auto c : vSpacing) vFontSpacing.push_back({ c >> 4, c & 15 });
|
for (auto c : vSpacing) vFontSpacing.push_back({ c >> 4, c & 15 });
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user